[kernel/f18: 5/6] Merge branch 'f18' of ssh://pkgs.fedoraproject.org/kernel into f18

[Peter Robinson]

commit bd39f7b459c79d65770c42a3bfea0f8de3f8bace
Merge: a3d0a42 5a7aaca
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Oct 19 12:07:31 2012 +0100

    Merge branch 'f18' of ssh://pkgs.fedoraproject.org/kernel into f18

 config-generic                                     |    4 +-
 iwlwifi-fix-6000-ch-switch.patch                   |   94 ++++++++++++++++++++
 kernel.spec                                        |   26 +++++-
 ...onnect-with-HT20-if-HT40-is-not-permitted.patch |   75 ++++++++++++++++
 mac80211_local_deauth_v3.6.patch                   |   66 ++++++++++++++
 5 files changed, 263 insertions(+), 2 deletions(-)
---