Linus Torvalds 31c4ab430a Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus ... * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Workaround for a sparse warning in include/asm-mips/mach-tx4927/ioremap.h [MIPS] Make show_code static and add __user tag [MIPS] Workaround for a sparse warning in include/asm-mips/compat.h [MIPS] Add some __user tags [MIPS] math-emu minor cleanup [MIPS] Kill CONFIG_TX4927BUG_WORKAROUND [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_FB_XPERT98 [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1000_SRC_CLK [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1000_USE32K [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1XXX_PSC_SPI [CHAR] Delete leftovers of old Alchemy UART driver		2007-07-13 10:44:45 -07:00
..
alpha
arm	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2007-07-12 14:17:12 -07:00
arm26
avr32
blackfin
cris
frv
h8300
i386	Revert "[CPUFREQ] powernow-k8: clarify number of cores."	2007-07-13 10:43:52 -07:00
ia64	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2007-07-12 13:41:29 -07:00
m32r
m68k
m68knommu
mips	[MIPS] Make show_code static and add __user tag	2007-07-13 17:40:01 +01:00
parisc
powerpc
ppc	Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6	2007-07-12 13:40:57 -07:00
s390
sh
sh64
sparc
sparc64
um
v850
x86_64	Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6	2007-07-12 13:40:57 -07:00
xtensa