aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi/sleep.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-03 14:40:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-03 14:40:10 -0700
commit3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (patch)
tree16c4ee5593847cc96e44e95f94e3ca0e315dfb1d /arch/x86/kernel/acpi/sleep.c
parent7046e668d7973c470146fbe6635967a1b4a31bca (diff)
parent0809f6ec18bbce54c996f5c36f4b9d371075c98b (diff)
downloadmrst-s0i3-test-3a09b1be53d23df780a0cd0e4087a05e2ca4a00c.tar.gz
mrst-s0i3-test-3a09b1be53d23df780a0cd0e4087a05e2ca4a00c.tar.xz
mrst-s0i3-test-3a09b1be53d23df780a0cd0e4087a05e2ca4a00c.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: GFS2: Fix recovery stuck bug (try #2) GFS2: Fix typo in stuffed file data copy handling Revert "GFS2: recovery stuck on transaction lock" GFS2: Make "try" lock not try quite so hard GFS2: remove dependency on __GFP_NOFAIL GFS2: Simplify gfs2_write_alloc_required GFS2: Wait for journal id on mount if not specified on mount command line GFS2: Use nobh_writepage
Diffstat (limited to 'arch/x86/kernel/acpi/sleep.c')
0 files changed, 0 insertions, 0 deletions