Age | Commit message (Collapse) | Author |
|
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
fs/fs-writeback.c
include/linux/drbd.h
|
|
Conflicts:
drivers/net/irda/irda-usb.c
|
|
Conflicts:
fs/notify/inotify/inotify.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
kernel/module.c
|
|
|
|
|
|
|
|
|
|
Conflicts:
drivers/net/wireless/wl12xx/wl1271.h
drivers/net/wireless/wl12xx/wl1271_cmd.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
arch/arm/plat-omap/i2c.c
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
|
|
|
|
|
|
|
|
|
|
|