diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-04 13:36:05 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-04 13:36:10 +1100 |
| commit | a80fa5739f264f25254d5d9a84ba175656bee8e9 (patch) | |
| tree | f6f516c7d20f729ef1a4506fa5baa78d9cf1b917 /drivers/input/mouse/sentelic.c | |
| parent | 1f4fa68ab6e09592bb0c068f34ba01a443f9faf3 (diff) | |
| parent | 6541101fa7a57ef88db199daab93e540b53180fe (diff) | |
Merge branch 'quilt/rr'
Conflicts:
arch/arm/kernel/vmlinux.lds.S
Diffstat (limited to 'drivers/input/mouse/sentelic.c')
0 files changed, 0 insertions, 0 deletions