android_kernel_xiaomi_sm7250/block
James Bottomley 1aedf2ccc6 Merge mulgrave-w:git/linux-2.6
Conflicts:

	include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.
2006-09-23 21:03:52 -05:00
..
as-iosched.c
blktrace.c
cfq-iosched.c
deadline-iosched.c
elevator.c
genhd.c
ioctl.c
Kconfig
Kconfig.iosched
ll_rw_blk.c Merge mulgrave-w:git/linux-2.6 2006-09-23 21:03:52 -05:00
Makefile
noop-iosched.c
scsi_ioctl.c