Merge branch 'for-next' from git://sources.calxeda.com/kernel/linux.git

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Grant Likely 2013-02-13 09:59:13 +00:00
commit bfc4a58986
4 changed files with 60 additions and 48 deletions

View file

@ -92,7 +92,7 @@ static inline void of_node_put(struct device_node *node) { }
extern struct device_node *of_allnodes;
extern struct device_node *of_chosen;
extern struct device_node *of_aliases;
extern rwlock_t devtree_lock;
extern raw_spinlock_t devtree_lock;
static inline bool of_have_populated_dt(void)
{