tree 4ffd91101601f55c5e0b53a00f03534b7e044ac4
parent 02b2318e07f98a7cdf7089a4457a8d62424aa824
parent bcd4f3acbaec102e2b8000c977ecc38dcd0fe367
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1184608100 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1184608100 -0700

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