diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-11 18:28:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-11 18:28:59 -0800 |
| commit | cd39301a68f9604854f3543117b01dc73cbe193f (patch) | |
| tree | 0be77134407d73aece97050151d80ed4b07b23bc /fs/ocfs2/dlm/userdlm.c | |
| parent | 13d7d84e078f49f08b657a3fba0d7a0b7b44ba65 (diff) | |
| parent | 3fc0eb47aa96b1d9230ff85b722c45c3b9e83d14 (diff) | |
Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32
* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
[AVR32] Add missing #include <linux/param.h> to delay.c
[AVR32] Pass dev parameter to dma_cache_sync()
[AVR32] Implement intc_get_pending()
[AVR32] Don't include <asm/delay.h>
[AVR32] Put the chip in "stop" mode when halting the system
[AVR32] Set flow handler for external interrupts
[AVR32] Remove unused file
[AVR32] Remove mii_phy_addr and eth_addr from eth_platform_data
[AVR32] Move ethernet tag parsing to board-specific code
[AVR32] Add macb1 platform_device
[AVR32] Portmux API update
Diffstat (limited to 'fs/ocfs2/dlm/userdlm.c')
0 files changed, 0 insertions, 0 deletions