diff options
| author | Linus Torvalds <[email protected]> | 2009-04-20 15:43:06 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-04-20 15:43:06 +0000 |
| commit | a939b96cccdb65df80a52447ec8e4a6d79c56dbb (patch) | |
| tree | b2d03cee9f019d360c03518dd447aa0e5b66db33 /arch/m32r/include/asm/assembler.h | |
| parent | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff) | |
| parent | PM/Suspend: Introduce two new platform callbacks to avoid breakage (diff) | |
| download | kernel-a939b96cccdb65df80a52447ec8e4a6d79c56dbb.tar.gz kernel-a939b96cccdb65df80a52447ec8e4a6d79c56dbb.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM/Suspend: Introduce two new platform callbacks to avoid breakage
Diffstat (limited to 'arch/m32r/include/asm/assembler.h')
0 files changed, 0 insertions, 0 deletions