android_kernel_xiaomi_sm8350/arch/sparc
David S. Miller 508827ff0a Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c
2009-03-05 02:06:47 -08:00
..
boot sparc,sparc64: unify boot/ 2008-12-04 09:17:21 -08:00
configs eeprom: More consistent symbol names 2009-01-26 21:19:57 +01:00
include/asm Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-03-05 02:06:47 -08:00
kernel sparc64: Fix crashes in jbusmc_print_dimm() 2009-02-11 00:54:07 -08:00
lib sparc64: Fix probe_kernel_{read,write}(). 2009-02-08 22:32:31 -08:00
math-emu sparc64: unify math-emu 2008-12-04 09:16:56 -08:00
mm sparc64: Kill bogus TPC/address truncation during 32-bit faults. 2009-02-03 16:28:23 -08:00
oprofile sparc64: Implement NMI watchdog on capable cpus. 2009-01-30 00:03:53 -08:00
prom sparc: Eliminate PROMLIB_INTERNAL as it does nothing 2009-01-08 16:59:01 -08:00
Kconfig [CVE-2009-0029] sparc: Enable syscall wrappers for 64-bit 2009-01-19 20:21:49 -08:00
Kconfig.debug sparc: unify Kconfig.debug 2008-12-04 09:16:48 -08:00
Makefile sparc: unify kernel/init_task 2008-12-04 13:28:09 -08:00