diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-07 13:42:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-07 13:42:14 -0400 |
| commit | 385861206c21364c01dcfdda5064643ce111d517 (patch) | |
| tree | 6c813af2c95a469a42e12df0b16ee357c377c80b /include/net/ieee802154/af_ieee802154.h | |
| parent | 131f7340b4f93f9a4a8e5a65abbd352b34d0ee08 (diff) | |
| parent | d82f1c35348cebe2fb2d4a4d31ce0ab0769e3d93 (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: matrix_keypad - make matrix keymap size dynamic
Input: wistron_btns - support Prestigio Wifi RF kill button
Input: i8042 - add Asus G1S to noloop exception list
Diffstat (limited to 'include/net/ieee802154/af_ieee802154.h')
0 files changed, 0 insertions, 0 deletions