Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 12 Oct 2007 16:25:42 +0000 (09:25 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 12 Oct 2007 16:25:42 +0000 (09:25 -0700)
commit7e6973e9aca997d95995a7b17768f7b77b7c6c24
treeb4b7904773e8ff55b455599f5bf8674b132ba3d4
parent000233e4d1321e54033d097e98f6868b11614217
parentb018fc09498f73da0014b44acbd59ea4a94300b4
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
  [BLOCK] s390 xpram typo
  [BLOCK] Only include the compat ioctl code if CONFIG_BLOCK is set
  [BLOCK] Better fix for do_blk_trace_setup() for !CONFIG_BLOCK
  [BLOCK] Move sector_div() from blkdev.h to kernel.h