| commit | ea3398a1ae54cd3403f3cc0f6aa498c7452c681a | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@suse.de> | Tue Dec 07 10:47:56 2010 -0800 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Tue Dec 07 10:47:56 2010 -0800 |
| tree | 19903cfd3eb11f6cdd84f3b6923e604028178150 | |
| parent | 03fa6fc5a68242ddd7cc3ba4255fe6f65b21ce41 [diff] | |
| parent | cf7d7e5a1980d1116ee152d25dac382b112b9c17 [diff] |
Staging: Merge 2.6.37-rc5 into staging-next This was done to handle a number of conflicts in the batman-adv and winbond drivers properly. It also now allows us to fix up the sysfs attributes properly that were not in the .37 release due to them being only in this tree at the time. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>