Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

This commit is contained in:
Dmitry Torokhov
2008-07-21 00:55:14 -04:00
6721 changed files with 460189 additions and 391035 deletions

View File

@@ -536,8 +536,8 @@ struct input_absinfo {
#define KEY_FRAMEBACK 0x1b4 /* Consumer - transport controls */
#define KEY_FRAMEFORWARD 0x1b5
#define KEY_CONTEXT_MENU 0x1b6 /* GenDesc - system context menu */
#define KEY_MEDIA_REPEAT 0x1b7 /* Consumer - transport control */
#define KEY_DEL_EOL 0x1c0
#define KEY_DEL_EOS 0x1c1