Eric Lapuyade
412fda538f
NFC: Changed HCI and PN544 HCI driver to use the new HCI LLC Core ...
The previous shdlc HCI driver and its header are removed from the tree.
PN544 now registers directly with HCI and passes the name of the llc it
requires (shdlc).
HCI instantiation now allocates the required llc instance. The llc is
started when the HCI device is brought up.
Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2012-09-25 00:17:26 +02:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-30 17:25:34 -07:00
drm/exynos: add property for plane zpos
2012-07-27 11:13:54 +09:00
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
2012-09-24 14:34:40 -04:00
[media] v4l2: add core support for the new VIDIOC_ENUM_FREQ_BANDS ioctl
2012-07-30 20:23:05 -03:00
NFC: Changed HCI and PN544 HCI driver to use the new HCI LLC Core
2012-09-25 00:17:26 +02:00
Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and 'qib' into for-linus
2012-07-22 23:26:17 -07:00
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
2012-07-25 15:58:48 -04:00
Sound fixes for 3.6-rc1
2012-08-01 10:42:26 -07:00
target: Allow for target_submit_cmd() returning errors
2012-07-17 17:05:05 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-31 19:25:39 -07:00
video: da8xx-fb: configure FIFO threshold to reduce underflow errors
2012-07-29 01:11:09 +00:00
xen PVonHVM: move shared_info to MMIO before kexec
2012-07-19 15:52:05 -04:00
412fda538f