Revision 67577927e8d7a1f4b09b4992df640eadc6aacb36 authored by David Woodhouse on 30 October 2010, 11:35:11 UTC, committed by David Woodhouse on 30 October 2010, 11:35:11 UTC
Conflicts: drivers/mtd/mtd_blkdevs.c Merge Grant's device-tree bits so that we can apply the subsequent fixes. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| File | Mode | Size |
|---|---|---|
| Kconfig | -rw-r--r-- | 3.0 KB |
| Kconfig.iosched | -rw-r--r-- | 1.8 KB |
| Makefile | -rw-r--r-- | 641 bytes |
| blk-cgroup.c | -rw-r--r-- | 38.5 KB |
| blk-cgroup.h | -rw-r--r-- | 10.4 KB |
| blk-core.c | -rw-r--r-- | 69.6 KB |
| blk-exec.c | -rw-r--r-- | 2.9 KB |
| blk-flush.c | -rw-r--r-- | 6.7 KB |
| blk-integrity.c | -rw-r--r-- | 11.1 KB |
| blk-ioc.c | -rw-r--r-- | 3.9 KB |
| blk-iopoll.c | -rw-r--r-- | 5.9 KB |
| blk-lib.c | -rw-r--r-- | 4.5 KB |
| blk-map.c | -rw-r--r-- | 8.2 KB |
| blk-merge.c | -rw-r--r-- | 11.0 KB |
| blk-settings.c | -rw-r--r-- | 25.7 KB |
| blk-softirq.c | -rw-r--r-- | 4.1 KB |
| blk-sysfs.c | -rw-r--r-- | 14.4 KB |
| blk-tag.c | -rw-r--r-- | 9.9 KB |
| blk-throttle.c | -rw-r--r-- | 27.7 KB |
| blk-timeout.c | -rw-r--r-- | 5.6 KB |
| blk.h | -rw-r--r-- | 4.6 KB |
| bsg.c | -rw-r--r-- | 23.4 KB |
| cfq-iosched.c | -rw-r--r-- | 104.2 KB |
| cfq.h | -rw-r--r-- | 3.6 KB |
| compat_ioctl.c | -rw-r--r-- | 21.0 KB |
| deadline-iosched.c | -rw-r--r-- | 11.4 KB |
| elevator.c | -rw-r--r-- | 24.2 KB |
| genhd.c | -rw-r--r-- | 30.0 KB |
| ioctl.c | -rw-r--r-- | 8.0 KB |
| noop-iosched.c | -rw-r--r-- | 2.6 KB |
| scsi_ioctl.c | -rw-r--r-- | 18.0 KB |
Computing file changes ...
