Len Brown d0e323b470 Merge branch 'apei' into apei-release ...

Some trivial conflicts due to other various merges
adding to the end of common lists sooner than this one.

	arch/ia64/Kconfig
	arch/powerpc/Kconfig
	arch/x86/Kconfig
	lib/Kconfig
	lib/Makefile

Signed-off-by: Len Brown <len.brown@intel.com>

2011-08-03 11:30:42 -04:00

..

alpha

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

arm

Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

2011-08-01 06:13:48 -10:00

avr32

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

blackfin

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

cris

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

frv

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

h8300

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

ia64

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

m32r

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

m68k

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

microblaze

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

2011-07-27 09:24:20 -07:00

mips

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

mn10300

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

openrisc

OpenRISC: Miscellaneous

2011-07-22 18:46:41 +02:00

parisc

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

powerpc

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

s390

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

score

modules: make arch's use default loader hooks

2011-07-24 22:06:04 +09:30

sh

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

sparc

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

tile

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

um

ptrace: unify show_regs() prototype

2011-07-26 16:49:43 -07:00

unicore32

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2011-07-29 23:35:05 -07:00

x86

Merge branch 'apei' into apei-release

2011-08-03 11:30:42 -04:00

xtensa

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

.gitignore

…

Kconfig

Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG

2011-08-03 11:12:37 -04:00