David Howells 4796b71fbb Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/pcmcia/ds.c Fix up merge failures with Linus's head and fix new compile failures. Signed-Off-By: David Howells <dhowells@redhat.com>		2006-12-06 15:01:18 +00:00
..
as-iosched.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 14:37:56 +00:00
blktrace.c
cfq-iosched.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 14:37:56 +00:00
deadline-iosched.c
elevator.c
genhd.c
ioctl.c
Kconfig	[PATCH] Centralise definitions of sector_t and blkcnt_t	2006-12-04 19:41:15 -08:00
Kconfig.iosched
ll_rw_blk.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 14:37:56 +00:00
Makefile
noop-iosched.c
scsi_ioctl.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2006-12-05 16:09:46 -08:00