aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-02 22:35:23 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-02 22:35:23 -0700
commite1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a (patch)
tree4e1ca325dde22f1ac21c9da0be509e87e922e604 /.gitignore
parentc0f39322c335412339dec16ebfd2a05ceba5ebcf (diff)
parent802fb176d8c635ae42da31b80841c26e8c7338a0 (diff)
downloadkernel_samsung_crespo-e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a.tar.gz
kernel_samsung_crespo-e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a.tar.bz2
kernel_samsung_crespo-e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/s2io.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions