openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/net/wireless/b43
History
Linus Torvalds 2be4ff2f08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
  pcmcia: ioctl-internal definitions
  pcmcia: cistpl header cleanup
  pcmcia: remove unused argument to pcmcia_parse_tuple()
  pcmcia: card services header cleanup
  pcmcia: device_id header cleanup
  pcmcia: encapsulate ioaddr_t
  pcmcia: cleanup device driver header file
  pcmcia: cleanup socket services header file
  pcmcia: merge ds_internal.h into cs_internal.h
  pcmcia: cleanup cs_internal.h
  pcmcia: cs_internal.h is internal
  pcmcia: use dev_printk for cs_error()
  pcmcia: remove CS_ error codes alltogether
  pcmcia: deprecate CS_BAD_TUPLE
  pcmcia: deprecate CS_BAD_ARGS
  pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
  pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
  pcmcia: deprecate CS_NO_MORE_ITEMS
  pcmcia: deprecate CS_IN_USE
  pcmcia: deprecate CS_CONFIGURATION_LOCKED
  ...

Fix trivial conflict in drivers/pcmcia/ds.c manually
 		2008-10-13 14:12:40 -07:00
..
Kconfig b43: Add LP-PHY template 2008-09-05 16:17:43 -04:00
Makefile b43: Add LP-PHY template 2008-09-05 16:17:43 -04:00
b43.h b43: fix QoS parameters initialization 2008-09-15 16:48:25 -04:00
debugfs.c b43: Implement dynamic PHY API 2008-08-29 16:24:12 -04:00
debugfs.h b43: Add debugfs firmware debugging knob 2008-06-27 09:09:16 -04:00
dma.c ssb, b43, b43legacy, b44: Rewrite SSB DMA API 2008-06-27 09:09:15 -04:00
dma.h mac80211: move TX info into skb->cb 2008-05-21 21:48:11 -04:00
leds.c b43: Fix possible MMIO access while device is down 2008-06-25 10:55:09 -04:00
leds.h
…
lo.c b43: Implement dynamic PHY API 2008-08-29 16:24:12 -04:00
lo.h b43: Implement dynamic PHY API 2008-08-29 16:24:12 -04:00
main.c mac80211: add multi-rate retry support 2008-10-06 18:14:57 -04:00
main.h b43: Add debugfs files for random SHM access 2008-06-26 16:49:18 -04:00
pcmcia.c pcmcia: remove unused argument to pcmcia_parse_tuple() 2008-08-31 15:50:33 +02:00
pcmcia.h
…
phy_a.c b43: Move Analog switching into phy code 2008-09-08 14:00:16 -04:00
phy_a.h b43: Split PHY alloc and init 2008-09-05 16:17:49 -04:00
phy_common.c mac80211: use nl80211 interface types 2008-09-15 16:48:23 -04:00
phy_common.h b43: Move Analog switching into phy code 2008-09-08 14:00:16 -04:00
phy_g.c b43 G-PHY: Remove mmiowb() 2008-09-11 15:53:32 -04:00
phy_g.h b43: Split PHY alloc and init 2008-09-05 16:17:49 -04:00
phy_lp.c b43: Move Analog switching into phy code 2008-09-08 14:00:16 -04:00
phy_lp.h b43: Split PHY alloc and init 2008-09-05 16:17:49 -04:00
phy_n.c b43: Move Analog switching into phy code 2008-09-08 14:00:16 -04:00
phy_n.h b43: Split PHY alloc and init 2008-09-05 16:17:49 -04:00
pio.c b43: Fix PIO skb clobber 2008-06-27 09:09:19 -04:00
pio.h mac80211: move TX info into skb->cb 2008-05-21 21:48:11 -04:00
rfkill.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-10-01 06:12:56 -07:00
rfkill.h b43: Rewrite and fix rfkill init 2007-11-10 04:25:12 -05:00
sysfs.c b43: Implement dynamic PHY API 2008-08-29 16:24:12 -04:00
sysfs.h
…
tables.c b43: Implement dynamic PHY API 2008-08-29 16:24:12 -04:00
tables.h b43: rewrite A PHY initialization 2008-01-28 15:04:31 -08:00
tables_nphy.c b43: Move code from nphy.* to phy_n.* 2008-09-05 16:17:43 -04:00
tables_nphy.h b43: Add lots of N-PHY lookup tables 2008-01-28 15:10:03 -08:00
wa.c b43: Implement dynamic PHY API 2008-08-29 16:24:12 -04:00
wa.h b43: rewrite A PHY initialization 2008-01-28 15:04:31 -08:00
xmit.c mac80211: add multi-rate retry support 2008-10-06 18:14:57 -04:00
xmit.h mac80211: move TX info into skb->cb 2008-05-21 21:48:11 -04:00