1
0
Fork 0
alistair23-linux/arch/cris
Linus Torvalds b904d7131d Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris:
  CRIS: Don't use mask_irq as symbol name
  CRIS: Simplify param.h by simply including <asm-generic/param.h>
  CRISv10: Whitespace fixes for hw_settings.S
  CRISv10: Trivial fixes.
  CRISv32: Fix RS485 port 4 CD Kconfig item.
  CRISv32: Remove duplicated Kconfig items.
  cris: push down BKL into some device drivers
2010-06-01 08:51:25 -07:00
..
arch-v10 Merge branch 'for-linus' of git://www.jni.nu/cris 2010-06-01 08:51:25 -07:00
arch-v32 Merge branch 'for-linus' of git://www.jni.nu/cris 2010-06-01 08:51:25 -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 'for-linus' of git://www.jni.nu/cris 2010-06-01 08:51:25 -07:00
kernel Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2010-05-19 17:10:06 -07:00
mm include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
Kconfig cris: Convert cris to use read/update_persistent_clock 2010-03-13 01:14:13 +01:00
Kconfig.debug [PATCH] arch/cris/Kconfig.debug: use lib/Kconfig.debug 2005-09-05 00:06:19 -07:00
Makefile arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0 2009-09-20 12:28:22 +02:00