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

Merge tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

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

Merge tag 'usb-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2014-04-01 17:06:09 -07:00

arm64

arm64: Fix duplicated Kconfig entries again

2014-04-02 13:40:29 -07:00

avr32

Merge tag 'char-misc-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2014-04-01 16:13:21 -07:00

blackfin

Merge tag 'pinctrl-v3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

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

Merge tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-04-01 15:14:04 -07:00

hexagon

locking/mcs: Allow architecture specific asm files to be used for contended case

2014-02-09 21:18:52 +01:00

ia64

Merge tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

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

Merge tag 'metag-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

2014-04-02 12:22:03 -07:00

microblaze

Merge tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-04-01 15:14:04 -07:00

mips

Merge tag 'usb-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

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

locking/mcs: Allow architecture specific asm files to be used for contended case

2014-02-09 21:18:52 +01:00

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

Merge tag 'usb-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2014-04-01 17:06:09 -07:00

s390

Merge tag 'driver-core-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2014-04-01 16:28:19 -07:00

score

arch: Remove stub cputime.h headers

2014-03-13 16:09:30 +01:00

sh

Merge tag 'usb-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2014-04-01 17:06:09 -07:00

sparc

Merge tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-04-01 15:14:04 -07:00

tile

Merge tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-04-01 15:14:04 -07:00

um

locking/mcs: Allow architecture specific asm files to be used for contended case

2014-02-09 21:18:52 +01:00

unicore32

locking/mcs: Allow architecture specific asm files to be used for contended case

2014-02-09 21:18:52 +01:00

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

…