]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
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)
* '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

1  2 
arch/cris/kernel/vmlinux.lds.S
drivers/net/cris/eth_v10.c

Simple merge
Simple merge