Johannes Berg
f9e10ce4cf
cfg80211: require add_virtual_intf to return new dev ...
cfg80211 used to do all its bookkeeping in
the notifier, but some new stuff will have
to use local variables so make the callback
return the netdev pointer.
Tested-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2010-12-06 16:01:28 -05:00
Merge branch 'misc' into release
2010-10-26 14:51:00 -04:00
audit: make link()/linkat() match "attribute change" predicate
2010-10-30 08:45:43 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next
2010-10-26 09:23:22 +10:00
nl80211/mac80211: define and allow configuring mesh element TTL
2010-12-06 16:01:28 -05:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2010-10-28 09:35:11 -07:00
mtd: Define MLC Flash as a different flash type
2010-10-25 00:50:20 +01:00
cfg80211: require add_virtual_intf to return new dev
2010-12-06 16:01:28 -05:00
pcmcia: IOCARD is also required for using IRQs
2010-10-22 08:46:36 +02:00
IB/core: Add VLAN support for IBoE
2010-10-25 10:20:39 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-10-31 20:43:12 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
2010-10-25 08:32:05 -07:00
Merge branch 'next' into upstream-merge
2010-10-27 23:44:47 -04:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
2010-10-28 20:14:38 +01:00
Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2010-10-28 17:11:17 -07:00
f9e10ce4cf