projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
87a9f70
8be1a6d
)
Merge commit 'upstream/master'
author
Haavard Skinnemoen
<haavard.skinnemoen@atmel.com>
Sun, 27 Jul 2008 11:54:08 +0000
(13:54 +0200)
committer
Haavard Skinnemoen
<haavard.skinnemoen@atmel.com>
Sun, 27 Jul 2008 11:54:08 +0000
(13:54 +0200)
1
2
arch/avr32/mach-at32ap/at32ap700x.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mmc/host/atmel-mci.c
patch
|
diff1
|
diff2
|
blob
|
history
include/asm-avr32/arch-at32ap/board.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/avr32/mach-at32ap/at32ap700x.c
Simple merge
diff --cc
drivers/mmc/host/atmel-mci.c
index
c2f8aa8
,
b68381f
..
82bbbe9
---
1
/
drivers/mmc/host/atmel-mci.c
---
2
/
drivers/mmc/host/atmel-mci.c
+++ b/
drivers/mmc/host/atmel-mci.c
@@@
-9,8
-9,8
+9,9
@@@
*/
#include <linux/blkdev.h>
#include <linux/clk.h>
+ #include <linux/debugfs.h>
#include <linux/device.h>
+#include <linux/err.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
diff --cc
include/asm-avr32/arch-at32ap/board.h
Simple merge