Merge tag 'v3.9-rc3' into drm-intel-next-queued

Backmerge so that I can merge Imre Deak's coalesced sg entries fixes,
which depend upon the new for_each_sg_page introduce in

commit a321e91b6d73ed011ffceed384c40d2785cf723b
Author: Imre Deak <imre.deak@intel.com>
Date:   Wed Feb 27 17:02:56 2013 -0800

    lib/scatterlist: add simple page iterator

The merge itself is just two trivial conflicts:

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 5 insertions, 0 deletions

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 014a2eaa5389..90cf75afcb02 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -86,6 +86,7 @@ struct bdaddr_list {
 struct bt_uuid {
         struct list_head list;
         u8 uuid[16];
+        u8 size;
         u8 svc_hint;
 };
 
@@ -152,6 +153,9 @@ struct hci_dev {
         __u8            minor_class;
         __u8            features[8];
         __u8            host_features[8];
+        __u8            le_features[8];
+        __u8            le_white_list_size;
+        __u8            le_states[8];
         __u8            commands[64];
         __u8            hci_ver;
         __u16           hci_rev;
@@ -216,6 +220,7 @@ struct hci_dev {
         unsigned long   le_last_tx;
 
         struct workqueue_struct *workqueue;
+        struct workqueue_struct *req_workqueue;
 
         struct work_struct      power_on;
         struct delayed_work     power_off;