| commit | 8c34482c17d8fd07966328c7b1cfc35ee290bd1c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 17 11:18:40 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 17 11:18:40 2011 -0800 |
| tree | 324f7535ae561dcc430764fd2c7531ff67d9780b | |
| parent | 1a47f7a84ef386c1f7f55f669598bd9894ceb73a [diff] | |
| parent | d95defaca7994ffff1ceb52f3011eb644dfe3274 [diff] |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: spi/spi_sh_msiof: fix a wrong free_irq() parameter dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch()