git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-25 00:52:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into next

Browse Source 
Conflicts:
	include/linux/kvm.h
This commit is contained in:
Benjamin Herrenschmidt
2009-12-09 17:14:38 +11:00
parent 11c34c7dea 3ff6a468b4
commit bcd6acd51f
3651 changed files with 249180 additions and 115589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/spi/wl12xx.h
View File

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