aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-25 05:29:49 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-25 05:29:49 +1000
commit34686fe689bf62d34af5379240caf7c446607ead (patch)
treeeb6f192631aa8469cba13d875a0f8a72e91e08cf /include/net
parentMerge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff)
parentomap: DMA: clear interrupt status correctly (diff)
downloadlinux-dev-34686fe689bf62d34af5379240caf7c446607ead.tar.xz
linux-dev-34686fe689bf62d34af5379240caf7c446607ead.zip
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: omap: DMA: clear interrupt status correctly OMAP3: Devkit8000: Fix tps65930 pullup/pulldown configuration arm: omap3: cm-t3517: minor comment fix arm: omap3: cm-t3517: rtc fix omap1: Fix sched_clock implementation when both MPU timer and 32K timer are used omap1: Fix booting for 15xx and 730 with omap1_defconfig omap1: Fix sched_clock for the MPU timer OMAP: PRCM: remove duplicated headers OMAP4: clockdomain: bypass unimplemented wake-up dependency functions on OMAP4 OMAP: counter_32k: init clocksource as part of machine timer init
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions