From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 9 Aug 2012 15:15:54 +0000 (-0700)
Subject: Merge changes made on two different machines...
X-Git-Tag: v3.5.1~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abc19dba74f2d4cd78524f011b65adaad3fae26a;p=thirdparty%2Fkernel%2Fstable-queue.git

Merge changes made on two different machines...
---

abc19dba74f2d4cd78524f011b65adaad3fae26a