]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit799c573e357381669e385f9444665d61b81c1ee6
tree4ffd91101601f55c5e0b53a00f03534b7e044ac4
parentb135d481b4be26786311bf839182fb9e15c45f8b
parent85d246de36d611a3d149edbf6af9988742799850
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