diff options
| author | Jiri Kosina | 2013-07-04 15:01:01 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2013-07-04 15:01:01 +0200 |
| commit | db58316892a5e9034efe718d4c1630788db7528f (patch) | |
| tree | c12d57181bb65807b0b7260163667cbd6308822b /drivers/oprofile | |
| parent | d0a934b764c67b4bf626f5b7cf725a6e3066afd2 (diff) | |
| parent | d8e5aec8d9e8754e4b4e12d9b61dc89fe229349b (diff) | |
| parent | c99f81887850cb593ea02bd14a68062547db8261 (diff) | |
| parent | 811adb9622de310efbb661531c3ec0ae5d2b2bc0 (diff) | |
Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and 'for-3.11/i2c-hid-fixed' into for-linus