aboutsummaryrefslogtreecommitdiff
path: root/kernel/power/swsusp.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-13 08:23:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-13 08:24:35 -0700
commitd3ab02a7c51fcbceafe999a515cc8bc4f0d0cfee (patch)
tree6322411e542509346f23b901d41af7be456dd4d5 /kernel/power/swsusp.c
parentd811f236d90e58c67092eaadacab609e76c38749 (diff)
parentbe79b0928900ffb9567893546a8285054e772a71 (diff)
Merge branch 'gm_20090410' of git://repo.or.cz/linux-2.6/trivial-mods
* 'gm_20090410' of git://repo.or.cz/linux-2.6/trivial-mods: MAINTAINERS - Update MN10300 patterns MAINTAINERS - Update frv arch patterns scripts/get_maintainer.pl - Allow multiple files on command line MAINTAINERS - Update Freescale sound patterns MAINTAINERS - Add additional patterns MAINTAINERS - Add missing "/" to some pattern directories MAINTAINERS - Update DRIVER CORE patterns MAINTAINERS - Update M68K patterns MAINTAINERS - Coalesce sections "DVB" and "Video for Linux" MAINTAINERS - Remove cyblafb frame buffer no longer in tree MAINTAINERS - Remove x86/Voyager no longer in tree MAINTAINERS - Update FPU Emulator contact address and web page MAINTAINERS - i2c_tiny_usb T: should be W: MAINTAINERS - Add Linus Torvalds' git MAINTAINERS - standardize "T: git urls" MAINTAINERS - Remove HP Fibre Channel HBA no longer in tree MAINTAINERS - Standardize style MAINTAINERS - Add file patterns Add scripts/get_maintainer.pl Acked-by: Pavel Machek <pavel@ucw.cz> Acked-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'kernel/power/swsusp.c')
0 files changed, 0 insertions, 0 deletions