| commit | 35a8524ffe84667e805b9249316e729e050c83b2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 01 08:27:55 2011 +1000 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 01 08:27:55 2011 +1000 |
| tree | b995e1adde02732f9d462a2097a09b7cddac7bf7 | |
| parent | ffbbf2da9e578dc7b7ae4f945412c4b74f54b20e [diff] | |
| parent | 0e6d8cad448bde3d846961bb43db15daae94562e [diff] |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR arm: omap2: mux: fix compile warning omap1: Simplify use of omap_irq_flags omap2+: Fix unused variable warning for omap_irq_base