diff --git a/[refs] b/[refs] index 9e86d4b88411..21d6f24a5e41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3b7cd2a9e3de578a462bb507279870dd41e032e +refs/heads/master: b024e33682c8e56cc8e869245dabd1b91ffe00ea diff --git a/trunk/arch/arm/mach-highbank/include/mach/memory.h b/trunk/arch/arm/mach-highbank/include/mach/memory.h deleted file mode 100644 index 40a8c178f10d..000000000000 --- a/trunk/arch/arm/mach-highbank/include/mach/memory.h +++ /dev/null @@ -1 +0,0 @@ -/* empty */