lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge v3.5-rc5 into driver-core-next

Browse Source 
This picks up the big printk fixes, and resolves a merge issue with:
	drivers/extcon/extcon_gpio.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2012-07-05 08:25:34 -07:00
parent f2c32a882d 6887a4131d
commit 6fbfd0592e
848 changed files with 8128 additions and 4098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/extcon/extcon_class.c
View File

@ -762,7 +762,7 @@ int extcon_dev_register(struct extcon_dev *edev, struct device *dev)
#if defined(CONFIG_ANDROID)
if (switch_class)
ret = class_compat_create_link(switch_class, edev->dev,
dev);
NULL);
#endif /* CONFIG_ANDROID */
spin_lock_init(&edev->lock);