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: (55 commits) ieee1394: sbp2: code formatting around work_struct stuff ieee1394: nodemgr: remove a kcalloc ieee1394: conditionally export ieee1394_bus_type ieee1394: Consolidate driver registering ieee1394: sbp2: convert from PCI DMA to generic DMA ieee1394: nodemgr: spaces to tabs ieee1394: nodemgr: fix deadlock in shutdown ieee1394: nodemgr: remove duplicate assignment sbp2: make 1bit bitfield unsigned ieee1394: schedule *_oui sysfs attributes for removal ieee1394: schedule unused symbol exports for removal ieee1394: dv1394: schedule for feature removal ieee1394: raw1394: defer feature removal of old isoch interface ieee1394: ohci1394: call PMac code in shutdown only for proper machines ieee1394: ohci1394: reformat PPC_PMAC platform code ieee1394: ohci1394: add PPC_PMAC platform code to driver probe ieee1394: sbp2: wrap two functions into one ieee1394: sbp2: update comment on things to do ieee1394: sbp2: use list_move_tail() ieee1394: sbp2: more concise names for types and variables ...
Showing
- Documentation/feature-removal-schedule.txt 33 additions, 5 deletionsDocumentation/feature-removal-schedule.txt
- drivers/ieee1394/Kconfig 8 additions, 18 deletionsdrivers/ieee1394/Kconfig
- drivers/ieee1394/Makefile 4 additions, 1 deletiondrivers/ieee1394/Makefile
- drivers/ieee1394/csr.c 3 additions, 5 deletionsdrivers/ieee1394/csr.c
- drivers/ieee1394/dv1394.c 8 additions, 16 deletionsdrivers/ieee1394/dv1394.c
- drivers/ieee1394/eth1394.c 1 addition, 3 deletionsdrivers/ieee1394/eth1394.c
- drivers/ieee1394/highlevel.h 0 additions, 1 deletiondrivers/ieee1394/highlevel.h
- drivers/ieee1394/hosts.c 24 additions, 17 deletionsdrivers/ieee1394/hosts.c
- drivers/ieee1394/ieee1394_core.c 2 additions, 2 deletionsdrivers/ieee1394/ieee1394_core.c
- drivers/ieee1394/nodemgr.c 280 additions, 185 deletionsdrivers/ieee1394/nodemgr.c
- drivers/ieee1394/nodemgr.h 6 additions, 1 deletiondrivers/ieee1394/nodemgr.h
- drivers/ieee1394/ohci1394.c 95 additions, 45 deletionsdrivers/ieee1394/ohci1394.c
- drivers/ieee1394/pcilynx.c 1 addition, 2 deletionsdrivers/ieee1394/pcilynx.c
- drivers/ieee1394/raw1394-private.h 5 additions, 5 deletionsdrivers/ieee1394/raw1394-private.h
- drivers/ieee1394/raw1394.c 18 additions, 5 deletionsdrivers/ieee1394/raw1394.c
- drivers/ieee1394/sbp2.c 815 additions, 1375 deletionsdrivers/ieee1394/sbp2.c
- drivers/ieee1394/sbp2.h 124 additions, 187 deletionsdrivers/ieee1394/sbp2.h
- drivers/ieee1394/video1394.c 17 additions, 37 deletionsdrivers/ieee1394/video1394.c
Loading
Please register or sign in to comment