summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-30 19:44:13 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-30 19:44:13 +0200
commit5fc3054d76a05633ae7341163b8c22a51e63483e (patch)
treefa8bbe4c3bbf1cd10f8ec249d9cb6b50c31b8404 /Makefile
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff)
parentMAINTAINERS: update AVR32 and AT32AP maintainers (diff)
downloadlinux-5fc3054d76a05633ae7341163b8c22a51e63483e.tar.xz
linux-5fc3054d76a05633ae7341163b8c22a51e63483e.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6: MAINTAINERS: update AVR32 and AT32AP maintainers
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions