Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 16 Jul 2007 17:48:20 +0000 (10:48 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 16 Jul 2007 17:48:20 +0000 (10:48 -0700)
commit14dc5249728ff699b1ca4dac01ad416a350a147a
tree4ffd91101601f55c5e0b53a00f03534b7e044ac4
parent02b2318e07f98a7cdf7089a4457a8d62424aa824
parentbcd4f3acbaec102e2b8000c977ecc38dcd0fe367
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:
  splice: direct splicing updates ppos twice
  more ACSI removal
  umem: Fix match of pci_ids in umem driver
  umem: Remove references to dead CONFIG_MM_MAP_MEMORY variable
  remove the documentation for the legacy CDROM drivers
Documentation/kernel-parameters.txt
MAINTAINERS
drivers/block/Kconfig
drivers/block/Makefile
drivers/net/Kconfig
drivers/net/Makefile