From: Paul Mackerras <paulus@samba.org>
Date: Wed, 3 Dec 2008 09:11:06 +0000 (+1100)
Subject: Merge branch 'merge'
X-Git-Tag: v2.6.29-rc1~574^2~105
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=527491885554002837b5742202adc0ab5f536e54;p=users%2Fwilly%2Flinux.git

Merge branch 'merge'
---

527491885554002837b5742202adc0ab5f536e54