Heiko Carstens 3c7ef08bba s390/facilities: cleanup PFMF and HPAGE machine facility detection ... MACHINE_HAS_PFMF and MACHINE_HAS_HPAGE actually have the same semantics: the cpu has the EDAT1 facility installed in zArch mode. So remove one of the feature flags in machine_flags and rename the other one to EDAT1. The two old macros simply get mapped to MACHINE_HAS_EDAT1. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>		2012-10-09 14:16:55 +02:00
..
alpha	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
arm	readahead: fault retry breaks mmap file read random detection	2012-10-09 16:22:47 +09:00
arm64	Kconfig: clean up the "#if defined(arch)" list for exception-trace sysctl entry	2012-10-09 16:22:14 +09:00
avr32	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
blackfin	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
c6x	Merge branch 'uapi-prep' of git://git.infradead.org/users/dhowells/linux-headers	2012-10-07 07:55:10 +09:00
cris	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
frv	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
h8300	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
hexagon	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
ia64	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
m32r	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
m68k	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
microblaze	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
mips	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
mn10300	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
openrisc	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
parisc	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
powerpc	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
s390	s390/facilities: cleanup PFMF and HPAGE machine facility detection	2012-10-09 14:16:55 +02:00
score	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
sh	readahead: fault retry breaks mmap file read random detection	2012-10-09 16:22:47 +09:00
sparc	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
tile	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
um	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
unicore32	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
x86	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
xtensa	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
.gitignore
Kconfig	thp, x86: introduce HAVE_ARCH_TRANSPARENT_HUGEPAGE	2012-10-09 16:22:29 +09:00