aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2010-09-05 00:28:47 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-09-05 00:28:47 -0700
commit5147a136f3ade69b9ce12afc022b1c37d43cf5d8 (patch)
treea33af1b06f2000ab82cc0527442de108c668843c /.gitignore
parenteea487fa0daadea3dbe2c25b9db5881976643e09 (diff)
parent470ec5b9affc1625ee67df9e74701e51973d7cdf (diff)
downloadpatches-5147a136f3ade69b9ce12afc022b1c37d43cf5d8.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/gregkh/patches
Conflicts: series
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions