tmp_suning_uos_patched/arch/cris
David S. Miller aa11d958d1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	arch/microblaze/include/asm/socket.h
2009-08-12 17:44:53 -07:00
..
arch-v10 CRISv10: remove redundant tests on unsigned 2009-06-23 10:05:05 +02:00
arch-v32 Merge branch 'for-linus' of git://www.jni.nu/cris 2009-06-23 10:47:01 -07:00
boot CRIS: Merge machine dependent boot/compressed and boot/rescue 2009-04-21 11:44:57 +02:00
configs CRIS: proper defconfig setup 2008-10-13 21:34:55 +02:00
include Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-08-12 17:44:53 -07:00
kernel headers: smp_lock.h redux 2009-07-12 12:22:34 -07:00
mm Move FAULT_FLAG_xyz into handle_mm_fault() callers 2009-06-21 13:08:22 -07:00
Kconfig trivial: fix typos/grammar errors in Kconfig texts 2009-03-30 15:22:01 +02:00
Kconfig.debug
Makefile CRIS: Merge machine dependent boot/compressed and boot/rescue 2009-04-21 11:44:57 +02:00