summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-07 22:15:02 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-07 22:15:02 +0100
commit214d93b02c4fe93638ad268613c9702a81ed9192 (patch)
treea86cbf70b48112bf00933fddc123d147a2de4275 /fs
parentMerge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (diff)
parentMerge branch 'for_2.6.38/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/k... (diff)
downloadlinux-214d93b02c4fe93638ad268613c9702a81ed9192.tar.xz
linux-214d93b02c4fe93638ad268613c9702a81ed9192.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: mailbox: resolve hang issue OMAP2+: PM: SmartReflex: fix memory leaks in Smartreflex driver arm: mach-omap2: smartreflex: fix another memory leak
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions