diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-20 08:46:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-20 08:46:11 -0700 |
| commit | 1bbe44f69d7ea20740aaf5aba356e331a74b58b3 (patch) | |
| tree | 4e71676275f2de09672d347244fc1b2bb67f39b1 /include/asm-x86/resume-trace.h | |
| parent | 8498ffd66774ce0e8550afc61a56b2cbeee77e9c (diff) | |
| parent | 9b9d6b2a4f6df5544a10de44760755fe757259e5 (diff) | |
Merge branch 'sh/for-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Provide a FLAT_PLAT_INIT() definition.
binfmt_flat: Stub in a FLAT_PLAT_INIT().
video: export sh_mobile_lcdc panel size
sh: select memchunk size using kernel cmdline
sh: export sh7723 VEU as VEU2H
input: migor_ts compile and detection fix
sh: remove MSTPCR defines from Migo-R header file
sh: Update sh7763rdp defconfig
sh: Add support sh7760fb to sh7763rdp board
sh: Add support sh_eth to sh7763rdp board
sh: Disable 64kB hugetlbpage size when using 64kB PAGE_SIZE.
sh: Don't export __{s,u}divsi3_i4i from SH-2 libgcc.
fix SH7705_CACHE_32KB compilation
sh: mach-x3proto: Fix up smc91x platform data.
Diffstat (limited to 'include/asm-x86/resume-trace.h')
0 files changed, 0 insertions, 0 deletions