From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 13 Nov 2011 23:32:34 +0000 (+1100)
Subject: Merge remote-tracking branch 'net/master'
X-Git-Tag: next-20111114~78
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f016927d1acf01061036cb9c31833aaf2817e6e3;p=karo-tx-linux.git

Merge remote-tracking branch 'net/master'
---

f016927d1acf01061036cb9c31833aaf2817e6e3