linux-toradex.git/arch/cris, branch v2.6.35.3 Linux kernel for Apalis and Colibri modules Merge branch 'for-linus' of git://www.jni.nu/cris 2010-06-01T15:51:25+00:00 Linus Torvalds torvalds@linux-foundation.org 2010-06-01T15:51:25+00:00 b904d7131d116900524bd36ec170dcd97846bfd3 * '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 
* '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
cris: use asm-generic/scatterlist.h 2010-05-27T16:12:55+00:00 FUJITA Tomonori fujita.tomonori@lab.ntt.co.jp 2010-05-26T21:44:35+00:00 16b3f4d65344878cff76306ed2630fa25c0ad5a7 Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: Mikael Starvik <starvik@axis.com> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
CRIS: Don't use mask_irq as symbol name 2010-05-25T15:48:14+00:00 Jesper Nilsson jesper.nilsson@axis.com 2010-05-25T15:48:14+00:00 4150764fbba03ce4675b02b10872c665bb05a8aa kernel/irq/chip.c now uses these, which lead to compile error for CRISv32. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> 
kernel/irq/chip.c now uses these, which lead to compile error
for CRISv32.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
CRIS: Simplify param.h by simply including <asm-generic/param.h> 2010-05-25T14:50:04+00:00 Jesper Nilsson jesper.nilsson@axis.com 2010-05-25T14:50:04+00:00 392ed655262446a7d9bc678394600a1d81614313 Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> 
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
CRISv10: Whitespace fixes for hw_settings.S 2010-05-25T13:04:06+00:00 Jesper Nilsson jesper.nilsson@axis.com 2010-05-25T13:04:06+00:00 6b9c88e2a3961346db1a23d967585af16ff33f05 Remove trailing whitespace. Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> 
Remove trailing whitespace.

Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
CRISv10: Trivial fixes. 2010-05-25T13:00:52+00:00 Jesper Nilsson jesper.nilsson@axis.com 2010-05-25T12:55:54+00:00 2f941a1be362cc2966ccb63cf15ccdfdb12a5a69 - Removed CVS id tag. - Formatting fixes Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> 
- Removed CVS id tag.
- Formatting fixes

Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
CRISv32: Fix RS485 port 4 CD Kconfig item. 2010-05-25T11:35:31+00:00 Jesper Nilsson jesper.nilsson@axis.com 2010-05-25T11:35:31+00:00 d708b41c96f404b8bb572f39973bbdf6d99d5f4b The Kconfig item for port 4 CD was controlled by the same Kconfig item as for port 3. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> 
The Kconfig item for port 4 CD was controlled by the same
Kconfig item as for port 3.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
CRISv32: Remove duplicated Kconfig items. 2010-05-25T11:33:51+00:00 Jesper Nilsson jesper.nilsson@axis.com 2010-05-25T11:33:51+00:00 f06d8b694c9c96d460990888561b3ab3a5f8192f The items were duplicated when they should have been moved. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> 
The items were duplicated when they should have been moved.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
fix handling of offsets in cris eeprom.c, get rid of fake on-stack files 2010-05-21T22:31:29+00:00 Al Viro viro@zeniv.linux.org.uk 2010-05-21T15:26:35+00:00 82f3952c02add60b15eea9151d4d99b6b82066c6 Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
get rid of home-grown mutex in cris eeprom.c 2010-05-21T22:31:29+00:00 Al Viro viro@zeniv.linux.org.uk 2010-05-21T15:19:18+00:00 4f0447b8184acb1d21b0fd71683d72ef2b83167b Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>