aboutsummaryrefslogtreecommitdiff
path: root/drivers/serial/sunzilog.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-04 15:09:52 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-04 15:09:52 -0700
commitd98550e334715b2d9e45f8f0f4e1608720108640 (patch)
treecd6a52960d479701cf6a29fd6535627481c5b27d /drivers/serial/sunzilog.c
parentf9cc8475e7595dbb41a9567f83288e2cd7445b6c (diff)
parentd205819e2346d20fee41297ea6cf789c591abccf (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] powerpc: Use the ibm,pa-features property if available powerpc: Fix incorrect might_sleep in __get_user/__put_user on kernel addresses [PATCH] ppc32 CPM_UART: fixes and improvements [PATCH] ppc32 CPM_UART: Fixed break send on SCC [PATCH] powerpc/kprobes: fix singlestep out-of-line [PATCH] powerpc/pseries: avoid crash in PCI code if mem system not up
Diffstat (limited to 'drivers/serial/sunzilog.c')
0 files changed, 0 insertions, 0 deletions