summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-24 07:21:45 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-24 07:21:45 (GMT)
commite1f1f07334e73fbe53fd8432f57846d5a1b90b5a (patch)
tree5806700a8a9509732aa2dc752c9e93b77052aa89 /arch
parent472e449c1018a6ef81bc6e38ddfc1eaab9378ca6 (diff)
parentd49824c06778830c82906884b94d94354c3bbdc8 (diff)
downloadlinux-e1f1f07334e73fbe53fd8432f57846d5a1b90b5a.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: Staging: sep: remove driver Staging: batman-adv: Don't write in not allocated packet_buff Staging: batman-adv: Don't use net_dev after dev_put Staging: batman-adv: Create batman_if only on register event Staging: batman-adv: fix own mac address detection Staging: batman-adv: always reply batman icmp packets with primary mac Staging: batman-adv: fix batman icmp originating from secondary interface Staging: batman-adv: unify orig_hash_lock spinlock handling to avoid deadlocks Staging: batman-adv: Fix merge of linus tree Staging: spectra: removes unused functions Staging: spectra: initializa lblk variable Staging: spectra: removes unused variable Staging: spectra: remove duplicate GLOB_VERSION definition Staging: spectra: don't use locked_ioctl, fix build Staging: use new REQ_FLUSH flag, fix build breakage Staging: spectra: removes q->prepare_flush_fn, fix build breakage
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions