diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2011-12-27 22:19:50 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 22:19:50 +0000 |
| commit | 70d84a6431d732cbc4e68e72b6890cdd3865d43d (patch) | |
| tree | 074543e1c6a303e3119e9493ad33213fdd5f0a92 /drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | |
| parent | arm/at91: fix build of stamp9g20 (diff) | |
| parent | arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC (diff) | |
| download | linux-dev-70d84a6431d732cbc4e68e72b6890cdd3865d43d.tar.xz linux-dev-70d84a6431d732cbc4e68e72b6890cdd3865d43d.zip | |
Merge branch 'tegra/cleanup' into next/cleanup
* tegra/cleanup:
arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC
arm/tegra: remove unused defines
arm/tegra: fix variable formatting in makefile
Conflicts:
arch/arm/mach-tegra/include/mach/entry-macro.S
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192ce/phy.c')
0 files changed, 0 insertions, 0 deletions