| Age | Commit message (Collapse) | Author |
|---|
|
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
|
|
|
Conflicts:
drivers/staging/rt2860/common/cmm_data_pci.c
drivers/staging/rt2860/common/cmm_data_usb.c
|
|
Conflicts:
arch/arm/mach-exynos4/mach-nuri.c
drivers/usb/host/isp1760-hcd.c
|
|
Conflicts:
drivers/bluetooth/hci_ldisc.c
drivers/tty/serial/Makefile
|
|
This reverts commit b50fa7c8077c625919b1e0a75fc37b825f024518.
|
|
|
|
Conflicts:
drivers/platform/x86/Kconfig
drivers/platform/x86/Makefile
drivers/platform/x86/eeepc-laptop.c
drivers/platform/x86/sony-laptop.c
|
|
Conflicts:
arch/x86/include/asm/percpu.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
arch/x86/Kconfig
|
|
|
|
|
|
Conflicts:
lib/flex_array.c
security/selinux/avc.c
security/selinux/hooks.c
security/smack/smack_lsm.c
|
|
|
|
|
|
Conflicts:
drivers/video/omap2/dss/dss_features.c
drivers/video/omap2/dss/dss_features.h
|
|
|
|
|
|
|
|
|
|
Conflicts:
mm/slub.c
|
|
|
|
Conflicts:
drivers/leds/Kconfig
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
drivers/cpufreq/cpufreq_stats.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
drivers/net/benet/be_main.c
|
|
|
|
|
|
|
|
|
