www.infradead.org Git - users/willy/linux.git/commitdiff

author	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Sat, 11 Aug 2007 23:01:06 +0000 (16:01 -0700)
committer	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Sat, 11 Aug 2007 23:01:06 +0000 (16:01 -0700)

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  BLOCK: Hide the contents of linux/bio.h if CONFIG_BLOCK=n
  sysace: HDIO_GETGEO has it's own method for ages
  drivers/block/cpqarray.c: better error handling and kmalloc + memset conversion to k[cz]alloc
  drivers/block/cciss.c: kmalloc + memset conversion to kzalloc
  Clean up duplicate includes in drivers/block/
  Fix remap handling by blktrace
  [PATCH] remove mm/filemap.c:file_send_actor()

		1	2
mm/filemap.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge