Merge branch 'nvram' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 9 Dec 2010 03:36:38 +0000 (14:36 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 9 Dec 2010 03:36:38 +0000 (14:36 +1100)
commitf4b98415953dcf85bac4ea0a2264a3ead4a7bcc4
tree7195ababc3542402a794036b98d480b81a147c0f
parent46f5221049bb46b0188aad6b6dfab5dbc778be22
parent6024ede9ba84aa1b891c2d6bc98eda07801235e5
Merge branch 'nvram' into next