summaryrefslogtreecommitdiff
path: root/drivers/video/pxafb.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-08-27 19:54:47 (GMT)
committerDavid S. Miller <davem@davemloft.net>2013-08-27 19:54:47 (GMT)
commitdecf4f3f2df60f87bd807e42d353ac5b7b55639d (patch)
tree20edb252dd2d8bb5d0288ffddbc3a87eccb844a8 /drivers/video/pxafb.c
parentae24f261e11ec30d343c7c5ee805ff29782f726b (diff)
parent81ca2ff9450c2e983ee416eca17ebe6fa9c3da4f (diff)
downloadlinux-fsl-qoriq-decf4f3f2df60f87bd807e42d353ac5b7b55639d.tar.xz
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says: ==================== This is one more set of fixes intended for the 3.11 stream... For the mac80211 bits, Johannes says: "I have three more patches for the 3.11 stream: Felix's fix for the fairly visible brcmsmac crash, a fix from Simon for an IBSS join bug I found and a fix for a channel context bug in IBSS I'd introduced." Along with those... Sujith Manoharan makes a minor change to not use a PLL hang workaroun for AR9550. This one-liner fixes a couple of bugs reported in the Red Hat bugzilla. Helmut Schaa addresses an ath9k_htc bug that mangles frame headers during Tx. This fix is small, tested by the bug reported and isolated to ath9k_htc. Stanislaw Gruszka reverts a recent iwl4965 change that broke rfkill notification to user space. Please let me know if there are problems! ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/video/pxafb.c')
0 files changed, 0 insertions, 0 deletions