alistair23-linux/arch
Josh Boyer 62d1a3ba5a arm64: Fix duplicated Kconfig entries again
Commit 7439717498 attempted to clean up the power management options
for arm64, but when things were merged it didn't fully take effect.  Fix
it again.

Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-04-02 13:40:29 -07:00
..
alpha PCI changes for the v3.15 merge window: 2014-04-01 15:14:04 -07:00
arc Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-03-31 10:59:39 -07:00
arm USB patches for 3.15-rc1 2014-04-01 17:06:09 -07:00
arm64 arm64: Fix duplicated Kconfig entries again 2014-04-02 13:40:29 -07:00
avr32 Char/Misc driver patches for 3.15-rc1 2014-04-01 16:13:21 -07:00
blackfin Pin control bulk changes for the v3.15 series, no new core 2014-04-01 13:10:49 -07:00
c6x Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-03-31 10:59:39 -07:00
cris Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-04-01 10:16:10 -07:00
frv PCI changes for the v3.15 merge window: 2014-04-01 15:14:04 -07:00
hexagon
ia64 PCI changes for the v3.15 merge window: 2014-04-01 15:14:04 -07:00
m32r arch: Remove stub cputime.h headers 2014-03-13 16:09:30 +01:00
m68k Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-04-01 11:22:57 -07:00
metag Metag architecture changes for v3.15 2014-04-02 12:22:03 -07:00
microblaze PCI changes for the v3.15 merge window: 2014-04-01 15:14:04 -07:00
mips USB patches for 3.15-rc1 2014-04-01 17:06:09 -07:00
mn10300 Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-04-01 11:22:57 -07:00
openrisc
parisc Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-04-01 11:22:57 -07:00
powerpc USB patches for 3.15-rc1 2014-04-01 17:06:09 -07:00
s390 Driver core / sysfs patches for 3.15-rc1 2014-04-01 16:28:19 -07:00
score arch: Remove stub cputime.h headers 2014-03-13 16:09:30 +01:00
sh USB patches for 3.15-rc1 2014-04-01 17:06:09 -07:00
sparc PCI changes for the v3.15 merge window: 2014-04-01 15:14:04 -07:00
tile PCI changes for the v3.15 merge window: 2014-04-01 15:14:04 -07:00
um
unicore32
x86 Merge branch 'x86-nuke-platforms-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-04-02 13:15:58 -07:00
xtensa Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-04-01 11:22:57 -07:00
.gitignore
Kconfig