backports: refresh patches on next-20130913

== ckmake-report.log ==

1   2.6.25              [  OK  ]
2   2.6.26              [  OK  ]
3   2.6.27              [  OK  ]
4   2.6.28              [  OK  ]
5   2.6.29              [  OK  ]
6   2.6.30              [  OK  ]
7   2.6.31              [  OK  ]
8   2.6.32              [  OK  ]
9   2.6.33              [  OK  ]
10  2.6.34              [  OK  ]
11  2.6.35              [  OK  ]
12  2.6.36              [  OK  ]
13  2.6.37              [  OK  ]
14  2.6.38              [  OK  ]
15  2.6.39              [  OK  ]
16  3.0.98              [  OK  ]
17  3.1.10              [  OK  ]
18  3.10.14             [  OK  ]
19  3.11.3              [  OK  ]
20  3.12-rc3            [  OK  ]
21  3.2.51              [  OK  ]
22  3.3.8               [  OK  ]
23  3.4.64              [  OK  ]
24  3.5.7               [  OK  ]
25  3.6.11              [  OK  ]
26  3.7.10              [  OK  ]
27  3.8.13              [  OK  ]
28  3.9.11              [  OK  ]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/patches/backport-adjustments/dma-buf.patch b/patches/backport-adjustments/dma-buf.patch
index fec0cc311ee45c4f3721eeb7b1ccdda5de38625e..88608c093b5908bbe334cc33f7e82b2a70683cad 100644 (file)
--- a/patches/backport-adjustments/dma-buf.patch
+++ b/patches/backport-adjustments/dma-buf.patch
@@ -11,7 +11,7 @@
  #include <linux/debugfs.h>
  #include <linux/seq_file.h>
  
-@@ -148,6 +152,27 @@ struct dma_buf *dma_buf_export_named(voi
+@@ -180,6 +184,27 @@ struct dma_buf *dma_buf_export_named(voi
  }
  EXPORT_SYMBOL_GPL(dma_buf_export_named);
  
@@ -39,7 +39,7 @@
  
  /**
   * dma_buf_fd - returns a file descriptor for the given dma_buf
-@@ -163,9 +188,10 @@ int dma_buf_fd(struct dma_buf *dmabuf, i
+@@ -195,9 +220,10 @@ int dma_buf_fd(struct dma_buf *dmabuf, i
        if (!dmabuf || !dmabuf->file)
                return -EINVAL;
  
@@ -51,7 +51,7 @@
  
        fd_install(fd, dmabuf->file);
  
-@@ -693,17 +719,15 @@ static inline void dma_buf_uninit_debugf
+@@ -725,17 +751,15 @@ static inline void dma_buf_uninit_debugf
  }
  #endif
  

diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rtl818x_rtl8187_dev.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rtl818x_rtl8187_dev.patch
index 071d0be59cd8d26c1744d782e3344ecfd9f8106a..291255bd760690ee8f3e65927a591bc37cb3c0a5 100644 (file)
--- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rtl818x_rtl8187_dev.patch
+++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rtl818x_rtl8187_dev.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
 +++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
-@@ -1290,9 +1290,17 @@ static void rtl8187_bss_info_changed(str
+@@ -1295,9 +1295,17 @@ static void rtl8187_bss_info_changed(str
  }
  
  static u64 rtl8187_prepare_multicast(struct ieee80211_hw *dev,

diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_qmi_wwan.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_qmi_wwan.patch
index c4c2130952c5b623ab7319798c0806618248b47b..2d65822947b65c402b392dcffd5b92d8959daae5 100644 (file)
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_qmi_wwan.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_qmi_wwan.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -674,7 +674,9 @@ static struct usb_driver qmi_wwan_driver
+@@ -802,7 +802,9 @@ static struct usb_driver qmi_wwan_driver
        .resume               = qmi_wwan_resume,
        .reset_resume         = qmi_wwan_resume,
        .supports_autosuspend = 1,

diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtl818x_rtl8187_dev.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtl818x_rtl8187_dev.patch
index a18bb3a393e4d4aacb171d88577c327929a6a21e..38234365474862b82b9efbc45679c99643f41a8e 100644 (file)
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtl818x_rtl8187_dev.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtl818x_rtl8187_dev.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
 +++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
-@@ -1673,7 +1673,9 @@ static struct usb_driver rtl8187_driver
+@@ -1678,7 +1678,9 @@ static struct usb_driver rtl8187_driver
        .id_table       = rtl8187_table,
        .probe          = rtl8187_probe,
        .disconnect     = rtl8187_disconnect,