aboutsummaryrefslogtreecommitdiffstats
path: root/linux/Makefile
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2011-08-24 15:40:05 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2011-08-24 15:40:05 -0700
commite5fb1e90d8bc5702095a06db47227b6df2e9945f (patch)
treec05ec889219b046452bd6b9b2b680443d0791c9e /linux/Makefile
parentdadc0999025959b1bb99846cf576ca8e10a15c72 (diff)
parente3f4df5bf10f5a64cfffdaa4f40a3960bd98cb95 (diff)
downloadsyslinux-e5fb1e90d8bc5702095a06db47227b6df2e9945f.tar.gz
syslinux-e5fb1e90d8bc5702095a06db47227b6df2e9945f.tar.xz
syslinux-e5fb1e90d8bc5702095a06db47227b6df2e9945f.zip
Merge remote-tracking branch 'sha0/ifmemdsk'
Conflicts: NEWS
Diffstat (limited to 'linux/Makefile')
0 files changed, 0 insertions, 0 deletions