Merge branch 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
commitb297d520b9af536d5580ac505dd316be4cf5560c
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 6 Feb 2008 03:05:48 +0000 (5 19:05 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 6 Feb 2008 03:05:48 +0000 (5 19:05 -0800)
treea8f292b308c166ebd383b73fa09538775352c874
parentc773633916c66f8362ca01983d97bd33e35b743f
parente34f44b3517fe545f7fd45a8c2f6ee1e5e4432d3
Merge branch 'dmapool' of git://git./linux/kernel/git/willy/misc

* 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
  pool: Improve memory usage for devices which can't cross boundaries
  Change dmapool free block management
  dmapool: Tidy up includes and add comments
  dmapool: Validate parameters to dma_pool_create
  Avoid taking waitqueue lock in dmapool
  dmapool: Fix style problems
  Move dmapool.c to mm/ directory
drivers/base/Makefile
mm/Makefile