Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 May 2006 22:09:52 +0000 (15:09 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 May 2006 22:09:52 +0000 (15:09 -0700)
commitd98550e334715b2d9e45f8f0f4e1608720108640
treecd6a52960d479701cf6a29fd6535627481c5b27d
parentf9cc8475e7595dbb41a9567f83288e2cd7445b6c
parentd205819e2346d20fee41297ea6cf789c591abccf
Merge branch 'merge' of git://git./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