diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-04-15 22:21:34 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-15 22:21:34 +0200 |
| commit | 5c01d5669356e13f0fb468944c1dd4c6a7e978ad (patch) | |
| tree | fa43345288d7b25fac92b3b35360a177c4947313 /drivers/ide/trm290.c | |
| parent | Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
| parent | wireless: rt2x00: rt2800usb: identify Sitecom devices (diff) | |
| download | linux-5c01d5669356e13f0fb468944c1dd4c6a7e978ad.tar.xz linux-5c01d5669356e13f0fb468944c1dd4c6a7e978ad.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/wl12xx/wl1271_main.c
Diffstat (limited to 'drivers/ide/trm290.c')
0 files changed, 0 insertions, 0 deletions