summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-05-10 11:44:21 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-05-10 11:44:21 -0300
commit9221076cd44e4035dd0b7d75362cc6c96a743f24 (patch)
tree79074a2eb6b803617aac1ff3d585f46846a2837e /patches
parent7ea60f965f56a584320ed970a53c6b68dba2f155 (diff)
parent39275986bae048a6d2a8a65247497d1db136b7c6 (diff)
Merge branch 'master' of https://projects.archlinux.org/git/linux-2.6-ARCH
Conflicts: PATCHCFG
Diffstat (limited to 'patches')
0 files changed, 0 insertions, 0 deletions