Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (56 commits) ieee1394: remove garbage from Kconfig ieee1394: more help in Kconfig ieee1394: ohci1394: Fix mistake in printk message. ieee1394: ohci1394: remove unnecessary rcvPhyPkt bit flipping in LinkControl register ieee1394: ohci1394: fix cosmetic problem in error logging ieee1394: eth1394: send async streams at S100 on 1394b buses ieee1394: eth1394: fix error path in module_init ieee1394: eth1394: correct return codes in hard_start_xmit ieee1394: eth1394: hard_start_xmit is called in atomic context ieee1394: eth1394: some conditions are unlikely ieee1394: eth1394: clean up fragment_overlap ieee1394: eth1394: don't use alloc_etherdev ieee1394: eth1394: omit useless set_mac_address callback ieee1394: eth1394: CONFIG_INET is always defined ieee1394: eth1394: allow MTU bigger than 1500 ieee1394: unexport highlevel_host_reset ieee1394: eth1394: contain host reset ieee1394: eth1394: shorter error messages ieee1394: eth1394: correct a memset argument ieee1394: eth1394: refactor .probe and .update ...
Showing
- drivers/ieee1394/Kconfig 21 additions, 31 deletionsdrivers/ieee1394/Kconfig
- drivers/ieee1394/config_roms.c 26 additions, 67 deletionsdrivers/ieee1394/config_roms.c
- drivers/ieee1394/config_roms.h 6 additions, 14 deletionsdrivers/ieee1394/config_roms.h
- drivers/ieee1394/csr1212.c 352 additions, 518 deletionsdrivers/ieee1394/csr1212.c
- drivers/ieee1394/csr1212.h 71 additions, 412 deletionsdrivers/ieee1394/csr1212.h
- drivers/ieee1394/dma.c 24 additions, 0 deletionsdrivers/ieee1394/dma.c
- drivers/ieee1394/dma.h 5 additions, 17 deletionsdrivers/ieee1394/dma.h
- drivers/ieee1394/eth1394.c 357 additions, 441 deletionsdrivers/ieee1394/eth1394.c
- drivers/ieee1394/eth1394.h 8 additions, 17 deletionsdrivers/ieee1394/eth1394.h
- drivers/ieee1394/highlevel.c 86 additions, 3 deletionsdrivers/ieee1394/highlevel.c
- drivers/ieee1394/highlevel.h 1 addition, 54 deletionsdrivers/ieee1394/highlevel.h
- drivers/ieee1394/hosts.c 10 additions, 13 deletionsdrivers/ieee1394/hosts.c
- drivers/ieee1394/hosts.h 1 addition, 9 deletionsdrivers/ieee1394/hosts.h
- drivers/ieee1394/ieee1394_core.c 263 additions, 198 deletionsdrivers/ieee1394/ieee1394_core.c
- drivers/ieee1394/ieee1394_core.h 16 additions, 84 deletionsdrivers/ieee1394/ieee1394_core.h
- drivers/ieee1394/ieee1394_transactions.c 42 additions, 1 deletiondrivers/ieee1394/ieee1394_transactions.c
- drivers/ieee1394/ieee1394_transactions.h 0 additions, 20 deletionsdrivers/ieee1394/ieee1394_transactions.h
- drivers/ieee1394/iso.c 83 additions, 2 deletionsdrivers/ieee1394/iso.c
- drivers/ieee1394/iso.h 2 additions, 33 deletionsdrivers/ieee1394/iso.h
- drivers/ieee1394/nodemgr.c 40 additions, 21 deletionsdrivers/ieee1394/nodemgr.c
Loading
Please register or sign in to comment