Merge remote-tracking branch 'origin' into irqdomain/next
authorGrant Likely <grant.likely@secretlab.ca>
Wed, 25 Jul 2012 04:31:09 +0000 (22:31 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Wed, 25 Jul 2012 04:34:40 +0000 (22:34 -0600)
1  2 
include/linux/of.h

Simple merge