projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee37ba7 f740f5c)
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <[email protected]>
Sat, 20 Jun 2009 00:43:04 +0000 (17:43 -0700)
committerLinus Torvalds <[email protected]>
Sat, 20 Jun 2009 00:43:04 +0000 (17:43 -0700)
* '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

1  2 
fs/ext4/super.c patch | diff1 | diff2 | blob | history

diff --cc fs/ext4/super.c
Simple merge
John Crispins staging tree