git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d29cecd 96fa2b5)
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Sat, 5 Dec 2009 23:22:26 +0000 (15:22 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 5 Dec 2009 23:22:26 +0000 (15:22 -0800)
Conflicts:
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/wireless/ray_cs.c


Trivial merge
Pandora Kernel Repository