aboutsummaryrefslogtreecommitdiff
path: root/arch/cris/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-09 08:01:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-09 08:01:19 -0700
commita8f43ee7e108cecf68cac652d0a3aeedb8131220 (patch)
tree53ddd1ab32f9146453531e3183654045c57d621f /arch/cris/Makefile
parent91e37a793b5a9436a2d12b2f0a8f52db3a133e1d (diff)
parent36ca34cc3b8335eb1fe8bd9a1d0a2592980c3f02 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: sit: Add missing kfree_skb() on pskb_may_pull() failure. tipc: Increase buffer header to support worst-case device
Diffstat (limited to 'arch/cris/Makefile')
0 files changed, 0 insertions, 0 deletions