Merge commit 'origin/master' into next
Conflicts: include/linux/kvm.h
This commit is contained in:
commit
bcd6acd51f
3651 changed files with 249180 additions and 115589 deletions
|
@ -26,6 +26,7 @@
|
|||
|
||||
struct wl12xx_platform_data {
|
||||
void (*set_power)(bool enable);
|
||||
bool use_eeprom;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue