git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0de70f 0384e29)
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Thu, 26 Mar 2009 22:23:24 +0000 (15:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Mar 2009 22:23:24 +0000 (15:23 -0700)
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c


Trivial merge
Pandora Kernel Repository