summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-19 17:43:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-19 17:43:04 -0700
commit31583d6acf940d2951bc8716557b06d9de5a0c4b (patch)
tree607aef385b0998f0cb7ff63b05407afed5182840 /mm
parentee37ba7a4212c7420f12e6a2ad8a3966649ede7a (diff)
parentf740f5ca056f0a4eff3abdf272a8a4ba3965d57d (diff)
downloadkernel-crypto-31583d6acf940d2951bc8716557b06d9de5a0c4b.tar.gz
kernel-crypto-31583d6acf940d2951bc8716557b06d9de5a0c4b.tar.xz
kernel-crypto-31583d6acf940d2951bc8716557b06d9de5a0c4b.zip
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: Fix kernel-doc parameter name typo in blk-settings.c: block: rename CONFIG_LBD to CONFIG_LBDAF block: Fix bounce_pfn setting hd: stop defining MAJOR_NR
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions