diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:44:36 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:44:36 -0400 |
| commit | c3d9d74336c10c133ed062a1d778d457c6a46422 (patch) | |
| tree | 3763bf5b68feca1088c5a87c6bdb23b14c42b736 /drivers | |
| parent | 35da7a307c535f9c2929cae277f3df425c9f9b1e (diff) | |
| parent | 569b10a506c4d5bc7398d040930539d84d3a2186 (diff) | |
| parent | cb174681a9ececa6702f114b85bdf82144b6a5af (diff) | |
Merge branches 'upstream' and 'upstream-fixes' into for-linus