diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 20:03:06 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 20:03:06 +0200 |
commit | 63634c86365b530af5026d409fd403801abe1e75 (patch) | |
tree | e2a323882ddd4d30ff8c6445965cdda1ce480477 /fs/reiserfs/resize.c | |
parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | davinci: fix compile warning: <mach/da8xx.h>: #include <linux/platform_device.h> (diff) | |
download | linux-63634c86365b530af5026d409fd403801abe1e75.tar.xz linux-63634c86365b530af5026d409fd403801abe1e75.zip |
Merge branch 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
* 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci:
davinci: fix compile warning: <mach/da8xx.h>: #include <linux/platform_device.h>
davinci: DM365: fix duplicate default IRQ priorities
davinci: edma: clear events in edma_start()
davinci: da8xx/omap-l1: fix build error when CONFIG_DAVINCI_MUX is undefined
davinci: timers: don't enable timer until clocksource is initialized
Diffstat (limited to 'fs/reiserfs/resize.c')
0 files changed, 0 insertions, 0 deletions