| commit | 5f8fe4270e53d38421ba34c428c3b58933b48e50 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 24 17:08:56 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 24 17:08:56 2009 -0700 |
| tree | 2148a3ba1ec842d0d0ad8f3e3eb209eb6eba673d | |
| parent | d9fbd9a2cd5ac1b286a7d7cdb1a180ce1edaee2f [diff] | |
| parent | 24924ece4482d5466ffcd0affedce63816c88e53 [diff] |
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