diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-09-06 13:59:53 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-09-06 13:59:53 +0400 |
| commit | 4e5a494e4b4ba7e6aa1a8a285e98e3665fcb396e (patch) | |
| tree | 04fcbf50c0a0b17e4604ddbea50485d38014c3bd /drivers/oprofile/oprof.h | |
| parent | 63faf15dba4a7d6fb18ed5c45670a152d0c5330b (diff) | |
| parent | 7b0692f1c60a9551f8ad5fe706b79a23720a196c (diff) | |
| download | linux-4e5a494e4b4ba7e6aa1a8a285e98e3665fcb396e.tar.xz | |
Merge branch 'for-3.12/sensor-hub' into for-linus
Conflicts:
drivers/hid/hid-sensor-hub.c
Diffstat (limited to 'drivers/oprofile/oprof.h')
0 files changed, 0 insertions, 0 deletions