forked from luck/tmp_suning_uos_patched
4796b71fbb
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> |
||
|---|---|---|
| .. | ||
| as-iosched.c | ||
| blktrace.c | ||
| cfq-iosched.c | ||
| deadline-iosched.c | ||
| elevator.c | ||
| genhd.c | ||
| ioctl.c | ||
| Kconfig | ||
| Kconfig.iosched | ||
| ll_rw_blk.c | ||
| Makefile | ||
| noop-iosched.c | ||
| scsi_ioctl.c | ||