From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 21 Jun 2007 22:57:50 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
X-Git-Tag: v2.6.22-rc6~42
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9738cbe32192919356397f1e24f9b26e1f574fbb;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of git://git.kernel.org/pub/scm/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
---

9738cbe32192919356397f1e24f9b26e1f574fbb