History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes.

David S. Miller committed 12 years ago

Commit 1f6d8032 parents a2aeb02 98f75b8467 files · +4648 −2442Browse files

Showing the changes to include/uapi/linux (2 of 467 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/Kbuild +2 −0
  2. include/uapi/linux/input.h +1 −0
include/uapi/linux/Kbuild+2−0
@@ -241,6 +241,7 @@ header-y += matroxfb.h · 240 unmodified lines
241241 header-y += mdio.h
242242 header-y += media.h
243243 header-y += mei.h
244+header-y += memfd.h
244245 header-y += mempolicy.h
245246 header-y += meye.h
246247 header-y += mic_common.h
@@ -396,6 +397,7 @@ header-y += un.h · 149 unmodified lines
396397 header-y += unistd.h
397398 header-y += unix_diag.h
398399 header-y += usbdevice_fs.h
400+header-y += usbip.h
399401 header-y += utime.h
400402 header-y += utsname.h
401403 header-y += uuid.h
include/uapi/linux/input.h+1−0
@@ -165,6 +165,7 @@ struct input_keymap_entry { · 164 unmodified lines
165165 #define INPUT_PROP_BUTTONPAD 0x02 /* has button(s) under pad */
166166 #define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */
167167 #define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */
168+#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */
168169
169170 #define INPUT_PROP_MAX 0x1f
170171 #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)