aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/pm.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-18 09:19:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-18 09:19:10 -0700
commit5ce00289875a853280985aee671258795b77e089 (patch)
treec88e4ec62cad3e83dadb49dddbcde81a2808a3c1 /arch/arm/mach-omap1/pm.h
parent2511817cf9b1cf2506f47e20bb128e2da231c150 (diff)
parent1329e3f2c898cfabb6ed236d3fb8c1725197af53 (diff)
downloadlinux-2.6.38-lt-ux500-5ce00289875a853280985aee671258795b77e089.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm: dlm: use kernel_sendpage dlm: fix connection close handling dlm: fix double-release of socket in error exit path
Diffstat (limited to 'arch/arm/mach-omap1/pm.h')
0 files changed, 0 insertions, 0 deletions