diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-10-25 03:58:12 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-10-25 03:58:12 -0400 |
| commit | f6f12427844516bc8e9cf84f43aca7bbbaa48157 (patch) | |
| tree | c3ac710e02d65fc08629b25fcfba0e79e0092910 /ipc/shm.c | |
| parent | b0eae38cebc54e618896d3e6a799939da51a8cac (diff) | |
| parent | bca621421c53caf73f36e181d6e5fe41fe0da7a7 (diff) | |
Merge branch 'upstream-fixes' into for-linus
Conflicts:
drivers/hid/hid-wacom.c
Diffstat (limited to 'ipc/shm.c')
0 files changed, 0 insertions, 0 deletions