diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:12:48 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:12:48 +0200 |
commit | d1e65d2a7bd9162e7009da870adb15c70b620320 (patch) | |
tree | 8eb7152b40e2f5868984f5f36cdfa142db53937c /arch/arm/mach-omap/include/mach/debug_ll.h | |
parent | cd323c02240af01eb914c87d9d7c41db6e34984b (diff) | |
parent | 77322aa896895f4f68501a071086e432e575dcc2 (diff) | |
download | barebox-d1e65d2a7bd9162e7009da870adb15c70b620320.tar.gz barebox-d1e65d2a7bd9162e7009da870adb15c70b620320.tar.xz |
Merge branch 'for-next/remove-fsf-address'
Conflicts:
drivers/net/miidev.c
include/miidev.h
Diffstat (limited to 'arch/arm/mach-omap/include/mach/debug_ll.h')
-rw-r--r-- | arch/arm/mach-omap/include/mach/debug_ll.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-omap/include/mach/debug_ll.h b/arch/arm/mach-omap/include/mach/debug_ll.h index be388d12d1..c1fcc9d9b6 100644 --- a/arch/arm/mach-omap/include/mach/debug_ll.h +++ b/arch/arm/mach-omap/include/mach/debug_ll.h @@ -12,9 +12,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with barebox. If not, see <http://www.gnu.org/licenses/>. */ #ifndef __MACH_DEBUG_LL_H__ |