summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-03-29 23:51:46 +0200
committerJames Morris <jmorris@namei.org>2011-03-29 23:51:46 +0200
commit93b9c98b3498db5842e2812b32cff4c1ae947eb1 (patch)
tree2d18e46cadcbf66fff695bb16e86531281cde7be /drivers
parentMerge branch 'master'; commit 'v2.6.39-rc1' into next (diff)
parentsecurity: select correct default LSM_MMAP_MIN_ADDR on ARM. (diff)
downloadlinux-93b9c98b3498db5842e2812b32cff4c1ae947eb1.tar.xz
linux-93b9c98b3498db5842e2812b32cff4c1ae947eb1.zip
Merge branch 'next-queue' into next
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions