diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-10-15 08:07:26 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-15 08:07:30 +0200 |
commit | a0738a688d1105cbf8d71868a1e020c6cdf42d4c (patch) | |
tree | 2cad553a9def773ce79b8fc793f89c0634187109 /drivers/input/mouse/amimouse.c | |
parent | x86, perf_event: Rename 'performance counter interrupt' (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
download | linux-a0738a688d1105cbf8d71868a1e020c6cdf42d4c.tar.xz linux-a0738a688d1105cbf8d71868a1e020c6cdf42d4c.zip |
Merge branch 'linus' into x86/urgent
Merge reason: pull in latest, to be able to revert a patch there.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/input/mouse/amimouse.c')
0 files changed, 0 insertions, 0 deletions