diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 22:06:11 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 22:06:11 (GMT) |
commit | 6800e4c0ea3e96cf78953b8b5743381cb1bb9e37 (patch) | |
tree | 5f55b84771d1b73bcaec534fdbbc1ec6dd21598d /fs/lockd | |
parent | 477d4e4fbedafb1cc636124f2de06defceb399b0 (diff) | |
parent | dfcccd3aaba15e4e8ffae65fb2a757b3e49470de (diff) | |
download | linux-fsl-qoriq-6800e4c0ea3e96cf78953b8b5743381cb1bb9e37.tar.xz |
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:
arm: omap1: devices: need to return with a value
OMAP1: camera.h: add missing include
omap: dma: Add read-back to DMA interrupt handler to avoid spuriousinterrupts
OMAP2: Devkit8000: Fix mmc regulator failure
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions