Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 21 Jun 2007 22:57:50 +0000 (15:57 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 21 Jun 2007 22:57:50 +0000 (15:57 -0700)
commit9738cbe32192919356397f1e24f9b26e1f574fbb
tree75caa6d21a8b68a36285ee787095fb05b14627fb
parent58229a18994215bbfe0bcd1c99d2e039f30b076b
parent05dc16d6a175139a5872d08db56ee277ec90df5b
Merge branch 'master' of git://git./linux/kernel/git/kyle/parisc-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  [PARISC] unwinder improvements
  [PARISC] Fix unwinder on 64-bit kernels
  [PARISC] Handle wrapping in expand_upwards()
  [PARISC] stop lcd driver from stripping initial whitespace