summaryrefslogtreecommitdiff
path: root/depcomp
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2009-12-28 18:04:35 +0100
committerTobias Klauser <tklauser@distanz.ch>2009-12-28 18:05:44 +0100
commit27612087400a3c8fdffc7e03ef5dff1e9c05087f (patch)
tree4daf18b0314036ec8758490d622689f85801a8ee /depcomp
parent0df2b2a2c8e6ebaea05390cb27f2c6432e03448f (diff)
Depend on emacsen-common to be able to install xcscope.el correctly (Closes: #562550).
Diffstat (limited to 'depcomp')
0 files changed, 0 insertions, 0 deletions
commit/sound/firewire/tascam/tascam-transaction.c?h=nds-private-remove&id=76e0e70e6452b971a69cc9794ff4a6715c11f7f2'>76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/firewire/tascam/tascam-transaction.c')