Merge commit 'origin/master' into next

Conflicts: include/linux/kvm.h
2009-12-09 17:14:38 +11:00
parent 11c34c7dea 3ff6a468b4
commit bcd6acd51f
3651 changed files with 249180 additions and 115589 deletions
--- a/include/linux/spi/wl12xx.h
+++ b/include/linux/spi/wl12xx.h
@ -26,6 +26,7 @@

 struct wl12xx_platform_data {
 	void (*set_power)(bool enable);
+	bool use_eeprom;
 };

 #endif