diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-05 12:29:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-05 12:29:43 -0700 |
| commit | 47e89798e7cd9390b74a173006afafcb12e8bc89 (patch) | |
| tree | 7c745202a7656f376b37e25c10117b38f1a562a8 /drivers/net/wireless/orinoco/scan.c | |
| parent | 884b8267d5f13bdcdc7e675ecbd0dbb0257689bb (diff) | |
| parent | c60e65d7863620945d498a8ac60181077879599c (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/pseries: Fix build without CONFIG_HOTPLUG_CPU
powerpc: Set nr_cpu_ids early and use it to free PACAs
powerpc/pseries: Don't register global initcall
powerpc/kexec: Fix mismatched ifdefs for PPC64/SMP.
edac/mpc85xx: Limit setting/clearing of HID1[RFXE] to e500v1/v2 cores
powerpc/85xx: Update dts for PCIe memory maps to match u-boot of Px020RDB
Diffstat (limited to 'drivers/net/wireless/orinoco/scan.c')
0 files changed, 0 insertions, 0 deletions