summaryrefslogtreecommitdiff
path: root/patches/aufs2-standalone-20110314.patch
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-07-09 13:32:39 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-07-09 13:32:39 -0300
commit274295bdd5635aab452916ab48795a5adc5391a4 (patch)
tree76f7bf91b5449e3f56ccb98532d4ff39831bae98 /patches/aufs2-standalone-20110314.patch
parent3fabd61dd8b4ce0e9d89e668755b4c7b05ab4211 (diff)
parent1846525ba4bc143d305200ba3cf10cdb58f2ce45 (diff)
Merge branch 'master' of https://projects.archlinux.org/git/linux-2.6-ARCHHEADmaster
Conflicts: PATCHCFG
Diffstat (limited to 'patches/aufs2-standalone-20110314.patch')
0 files changed, 0 insertions, 0 deletions