diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 12:42:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 12:42:43 -0400 |
| commit | 203f3394397642f2f9d9ee760f03420459b7a8ef (patch) | |
| tree | 75fdd447e2cebd0919988f42a2f34c5fbe9923d8 /drivers/char/apm-emulation.c | |
| parent | ef1c5339d9413ab57c9b2aa768f3c67485d11acb (diff) | |
| parent | 96989d9d754ef1fa55e71beff6a076f79cc1717e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23:
sh: remove extraneous ; on scif_sercon_putc wait loop
sh: Add missing dma_sync_single_range_for_*().
sh: panic on machvec section misalignment.
sh: Fix PTRACE_PEEKTEXT/PEEKDATA fallout from generic_ptrace_peekdata().
Diffstat (limited to 'drivers/char/apm-emulation.c')
0 files changed, 0 insertions, 0 deletions