linux-toradex.git/net/bluetooth/hidp, branch v3.7

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

2012-09-28T18:40:49+00:00

Conflicts:
	drivers/net/team/team.c
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/bat_iv_ogm.c
	net/ipv4/fib_frontend.c
	net/ipv4/route.c
	net/l2tp/l2tp_netlink.c

The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.

qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.

With help from Antonio Quartulli.

Signed-off-by: David S. Miller

net: change return values from -EACCES to -EPERM

2012-09-21T17:58:08+00:00

Change return value from -EACCES to -EPERM when the permission check fails.

Signed-off-by: Zhao Hongjiang 
Signed-off-by: David S. Miller

Bluetooth: Added /proc/net/hidp via bt_procfs_init()

2012-08-06T18:02:59+00:00

Added /proc/net/hidp via bt_procfs_init().

Signed-off-by: Masatake YAMATO 
Signed-off-by: Gustavo Padovan

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

2012-06-29T00:37:00+00:00

Conflicts:
	drivers/net/caif/caif_hsi.c
	drivers/net/usb/qmi_wwan.c

The qmi_wwan merge was trivial.

The caif_hsi.c, on the other hand, was not.  It's a conflict between
1c385f1fdf6f9c66d982802cd74349c040980b50 ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19cd0a30be93794aa4773c779c3eb1f3 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.

I did my best with that one and will ask Sjur to check it out.

Signed-off-by: David S. Miller

HID: Fix the generic Kconfig options

2012-06-25T15:25:00+00:00

The generic HID driver is obviously not a special driver, so move it
outside of the special drivers menu. Explain the usage and make the
default follow the HID setting. This should simplify migration from
older kernels. While at it, remove the redundant HID_SUPPORT option
and modify the HID and USB_HID entries to better explain the bus
structure.

Reported-by: Jan Beulich 
Signed-off-by: Henrik Rydberg 
Signed-off-by: Jiri Kosina

Bluetooth: Fix style in hidp code

2012-06-09T22:22:42+00:00

Follow the net rules.

Signed-off-by: Gustavo Padovan

Bluetooth: Remove unnecessary headers include

2012-06-05T03:34:08+00:00

Most of the include were unnecessary or already included by some other
header.
Replace module.h by export.h where possible.

Signed-off-by: Gustavo Padovan 
Signed-off-by: Marcel Holtmann

Bluetooth: Remove most of the inline usage

2012-06-05T03:34:07+00:00

Only obvious cases were left as inline, mostly oneline functions.

Signed-off-by: Gustavo Padovan 
Signed-off-by: Marcel Holtmann

HID: Create a common generic driver

2012-05-01T10:54:55+00:00

Move the hid drivers of the bus drivers to a common generic hid
driver, and make it a proper module. This ought to simplify device
handling moving forward.

Cc: Gustavo Padovan 
Signed-off-by: Henrik Rydberg 
Signed-off-by: Jiri Kosina

HID: Create a generic device group

2012-05-01T10:54:55+00:00

Devices that do not have a special driver are handled by the generic
driver. This patch does the same thing using device groups; Instead of
forcing a particular driver, the appropriate driver is picked up by
udev. As a consequence, one can now move a device from generic to
specific handling by a simple rebind. By adding a new device id to the
generic driver, the same thing can be done in reverse.

Signed-off-by: Henrik Rydberg 
Acked-by: Benjamin Tissoires 
Signed-off-by: Jiri Kosina