Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h
This commit is contained in:
Benjamin Herrenschmidt 2009-12-09 17:14:38 +11:00
commit bcd6acd51f
3651 changed files with 249180 additions and 115589 deletions

View file

@ -26,6 +26,7 @@
struct wl12xx_platform_data {
void (*set_power)(bool enable);
bool use_eeprom;
};
#endif