From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 4 Jun 2005 21:07:40 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch viro
X-Git-Tag: firefly_0821_release~40856^2~21^2~231^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=105adfc63f921a9976c5abc4ff079e9fec197ed7;p=firefly-linux-kernel-4.4.55.git

Merge ... /spare/repo/netdev-2.6 branch viro
---

105adfc63f921a9976c5abc4ff079e9fec197ed7