diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-11 16:28:19 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-11 16:28:19 +0100 |
| commit | 734d1ece37fbf3d2ddfc71bc6c69e0fe35f02542 (patch) | |
| tree | c4805dd7e746b1feb9e09e9849f3245d0b2c0c6b /drivers/eisa/eisa.ids | |
| parent | [media] omap3isp: Don't include <plat/cpu.h> (diff) | |
| parent | Linux 3.8-rc3 (diff) | |
| download | linux-734d1ece37fbf3d2ddfc71bc6c69e0fe35f02542.tar.xz linux-734d1ece37fbf3d2ddfc71bc6c69e0fe35f02542.zip | |
Merge tag 'v3.8-rc3' into v4l_for_linus
Linux 3.8-rc3
* tag 'v3.8-rc3': (11110 commits)
Linux 3.8-rc3
mm: reinstante dropped pmd_trans_splitting() check
cred: Remove tgcred pointer from struct cred
drm/ttm: fix fence locking in ttm_buffer_object_transfer
ARM: clps711x: Fix bad merge of clockevents setup
ARM: highbank: save and restore L2 cache and GIC on suspend
ARM: highbank: add a power request clear
ARM: highbank: fix secondary boot and hotplug
ARM: highbank: fix typos with hignbank in power request functions
ARM: dts: fix highbank cpu mpidr values
ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
drm/prime: drop reference on imported dma-buf come from gem
xen/netfront: improve truesize tracking
ARM: mx5: Fix MX53 flexcan2 clock
ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
sctp: fix Kconfig bug in default cookie hmac selection
EDAC: Cleanup device deregistering path
EDAC: Fix EDAC Kconfig menu
EDAC: Fix kernel panic on module unloading
ALSA: hda - add mute LED for HP Pavilion 17 (Realtek codec)
...
Diffstat (limited to 'drivers/eisa/eisa.ids')
| -rw-r--r-- | drivers/eisa/eisa.ids | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/eisa/eisa.ids b/drivers/eisa/eisa.ids index 6cbb7a514436..2d864b48a48f 100644 --- a/drivers/eisa/eisa.ids +++ b/drivers/eisa/eisa.ids @@ -985,8 +985,8 @@ ISABD00 "Racal-Interlan NP600A Ethernet 16bit" ISABD02 "Racal-Interlan NI5210/8 Ethernet" ISABD03 "Racal-Interlan NI5210/16 Ethernet" ISABE00 "Qua Tech PXB-1608 Parallel Expansion Board" -ISABE01 "Qua Tech ES-100 8 Channel Asyncronous" -ISABE02 "Qua Tech QS-100M 4 Channel Asyncronous" +ISABE01 "Qua Tech ES-100 8 Channel Asynchronous" +ISABE02 "Qua Tech QS-100M 4 Channel Asynchronous" ISABE03 "Qua Tech MXI-100 IEEE 488 GPIB" ISABE04 "Qua Tech DS-201 Dual Channel RS-422" ISABE05 "Qua Tech PXB-721 Parallel Expansion" |