]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Jul 2013 01:18:22 +0000 (11:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Jul 2013 01:18:22 +0000 (11:18 +1000)
Conflicts:
drivers/net/wireless/rtlwifi/ps.c

1  2 
net/bluetooth/hci_core.c
net/bluetooth/hidp/core.c

Simple merge
Simple merge