diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:14:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:14:19 -0700 |
commit | 2a50b2560ee956808da0b644cb529608dee65274 (patch) | |
tree | 7065f72e76919f571580378b3758acc1355564dd /include/net/wimax.h | |
parent | ba933beb11b46b6d90d53b7220858148d8687ab1 (diff) | |
parent | ab96ddec7213004b632d24dc2cdcd2df5f16f50b (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: serio - fix protocol number for TouchIT213
Diffstat (limited to 'include/net/wimax.h')
0 files changed, 0 insertions, 0 deletions