diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-01 11:26:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-01 11:26:26 -0700 |
| commit | d5f1a21ca05cad212829460ee7900915128e3401 (patch) | |
| tree | cc9a7f00436677f5ac8398a3f7d099bfb2353403 /drivers/watchdog | |
| parent | 1f4cfbaa2bede7d371ea2e589e87c6881235a711 (diff) | |
| parent | 1035d60d92325bddcc4248df5a27dcd5698f5931 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4875/1: Add MODULE_ALIAS to ixp4xx-beeper module
[ARM] 4873/1: Fix ITE 8152 interrupt demux
[ARM] 4878/1: Add oabi shim for fstatat64
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions