Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Sep 2009 00:08:56 +0000 (17:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Sep 2009 00:08:56 +0000 (17:08 -0700)
commit5f8fe4270e53d38421ba34c428c3b58933b48e50
tree2148a3ba1ec842d0d0ad8f3e3eb209eb6eba673d
parentd9fbd9a2cd5ac1b286a7d7cdb1a180ce1edaee2f
parent24924ece4482d5466ffcd0affedce63816c88e53
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror

* 'for-linus' of git://repo.or.cz/cris-mirror:
  CRIS: Cleanup linker script using new linker script macros.
  ARRAY_SIZE changes
  CRIS: convert to asm-generic/hardirq.h
  CRISv10: Don't autonegotiate if autonegotiation is off
  CRIS: fix defconfig build failure
  CRIS: add pgprot_noncached
arch/cris/kernel/vmlinux.lds.S
drivers/net/cris/eth_v10.c