summaryrefslogtreecommitdiffstats
path: root/include/asm-frv
diff options
context:
space:
mode:
authorLinus Torvalds2006-12-08 01:18:46 +0100
committerLinus Torvalds2006-12-08 01:18:46 +0100
commitc99767974ebd2a719d849fdeaaa1674456f5283f (patch)
tree571d49bd7872697ab28b0aeb4f79fe9c2a5cb9bd /include/asm-frv
parentMerge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentieee1394: sbp2: code formatting around work_struct stuff (diff)
downloadkernel-qcow2-linux-c99767974ebd2a719d849fdeaaa1674456f5283f.tar.gz
kernel-qcow2-linux-c99767974ebd2a719d849fdeaaa1674456f5283f.tar.xz
kernel-qcow2-linux-c99767974ebd2a719d849fdeaaa1674456f5283f.zip
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 ...
Diffstat (limited to 'include/asm-frv')
0 files changed, 0 insertions, 0 deletions