Jiri Kosina 6396fc3b3f Merge branch 'master' into for-next ... Conflicts: fs/exofs/inode.c		2010-08-11 09:36:51 +02:00
..
boot	…
configs	xtensa: Disable PCI and nfsroot on simulation target	2010-08-03 00:18:38 -07:00
include/asm	Merge branch 'master' into for-next	2010-08-11 09:36:51 +02:00
kernel	Merge remote branch 'origin/master'	2010-08-03 00:38:00 -07:00
lib	…
mm	…
platforms	…
variants	…
Kconfig	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02:00
Kconfig.debug	…
Makefile	…