| commit | 45ff993d2b0b4c07038457cdf07ecf648abd3d78 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Nov 09 15:24:19 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Nov 09 15:24:19 2007 -0800 |
| tree | ae2f89ce5741e36d6eaab3178d86c2cd754801e4 | |
| parent | cb834e7cc0e8b223386f219c1d1986846c87c55f [diff] | |
| parent | 91bc51d8a10b00d8233dd5b6f07d7eb40828b87d [diff] |
Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] pxa: fix one-shot timer mode [ARM] 4645/1: Cyberpro: Trivial fix to restore 16bpp mode. [ARM] 4644/2: fix flush_kern_tlb_range() in module space [ARM] Allow watchdog drivers to be selected again [ARM] 4633/1: omap build fix when FB enabled [ARM] 4642/2: netX: default config for netx based boards [ARM] 4641/2: netX: fix kobject_name type [ARM] Fix iop3xx macro