summaryrefslogtreecommitdiffstats
path: root/drivers/staging/android/uapi
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-16 17:12:04 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-16 17:12:04 -0800
commit5c5bccb76cb94888f40ebd5584b81646632e9c3f (patch)
treeee949fa6cc1dbe2632154b38ef6dd28f6185d218 /drivers/staging/android/uapi
parent24b3aa09970304ece816e73c3d7174d0dd315b98 (diff)
parent319e2e3f63c348a9b66db4667efa73178e18b17d (diff)
downloadlinux-5c5bccb76cb94888f40ebd5584b81646632e9c3f.tar.bz2
Merge 3.13-rc4 into staging-next.
We want the fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/uapi')
0 files changed, 0 insertions, 0 deletions