Age | Commit message (Collapse) | Author |
|
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
|
|
|
|
|
Conflicts:
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/brcm80211/brcmfmac/wl_iw.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
arch/arm/mach-ep93xx/Makefile
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
drivers/mtd/maps/pxa2xx-flash.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
drivers/mmc/host/sdhci-of-core.c
|
|
Conflicts:
drivers/leds/Kconfig
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
drivers/net/wireless/rtlwifi/pci.c
|
|
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
|
|
|
|
|
|
|
|
|
|
|