diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-24 17:01:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-24 17:01:45 -0700 |
commit | 317ec6cd00f25d05d153a780bc178c5335f320ee (patch) | |
tree | ebeab6da87789807d1852edd7228a73cafe4e493 /arch/mips/cobalt/reset.c | |
parent | 0fa7d868ca456ddf4f41b700fd9dee186f8f4e12 (diff) | |
parent | 53698d2537bc8c2b8fedc788b8b927da9a004f9b (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4278/1: configure pxa27x I2C SCL as "input"
[ARM] 4272/1: Missing symbol h1940_pm_return fix
[ARM] 4235/1: ns9xxx: declare the clock functions as "const"
[ARM] 4271/1: iop32x: fix ep80219 detection (support iq80219 platforms)
[ARM] 4270/2: mach-s3c2443/irq.c off by one error in dma irqs
Diffstat (limited to 'arch/mips/cobalt/reset.c')
0 files changed, 0 insertions, 0 deletions