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 <[email protected]>

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

[PATCH] blktrace: don't return blktrace_seq from trace_note()

2006-12-04 09:30:58 +01:00

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

[BLOCK] Cleanup unused variable passing

2006-12-01 10:42:33 +01:00

elevator.c

[BLOCK] Cleanup unused variable passing

2006-12-01 10:42:33 +01:00

genhd.c

…

ioctl.c

[PATCH] dm: export blkdev_driver_ioctl

2006-10-03 08:04:13 -07:00

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

[BLOCK] Cleanup unused variable passing

2006-12-01 10:42:33 +01:00

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