git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a18642 a55eb05)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 2 Feb 2007 16:13:23 +0000 (08:13 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 2 Feb 2007 16:13:23 +0000 (08:13 -0800)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  spidernet : fix memory leak in spider_net_stop
  e100: fix napi ifdefs removing needed code
  netxen patches


Trivial merge
Pandora Kernel Repository