From: James Morris <jmorris@namei.org>
Date: Thu, 28 Aug 2008 00:47:34 +0000 (+1000)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.6.28-rc1~724^2^2~8
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=86d688984deefa3ae5a802880c11f2b408b5d6cf

Merge branch 'master' into next
---

86d688984deefa3ae5a802880c11f2b408b5d6cf