Age | Commit message (Collapse) | Author |
|
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
|
|
|
|
|
Conflicts:
arch/arm/mach-exynos4/mach-nuri.c
|
|
Conflicts:
drivers/bluetooth/hci_ldisc.c
|
|
|
|
Conflicts:
drivers/platform/x86/intel_pmic_gpio.c
|
|
|
|
Conflicts:
arch/x86/include/asm/percpu.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
drivers/net/wireless/rtlwifi/pci.c
|
|
|
|
Conflicts:
security/selinux/avc.c
security/selinux/hooks.c
security/smack/smack_lsm.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
drivers/leds/Kconfig
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
drivers/net/wireless/rtlwifi/pci.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|