Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/cooloney/blackfin-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (74 commits)
  Blackfin serial driver: pending a unique anomaly id, tie the break flood issue to ANOMALY_05000230
  blackfin enable arbitary speed serial setting
  Blackfin arch: Remove cruft - CONFIG_DEBUG_SERIAL_EARLY_INIT and DEBUG_KERNEL_START
  Blackfin arch: fix typo in register name
  Blackfin arch: trim the Blackfin arch MAINTAINERS list
  Blackfin arch: fix bug libstdc++ calling writev with an iovec containing { NULL, 0 } fails on Blackfin
  Blackfin arch: Export strcpy - occasionally get module link failures otherwise
  Blackfin arch: the load address is not safe to point to as a workaround for ANOMALY 05000281
  Blackfin arch: show_mem can not be marked as init, since it is called during OOM condition
  Blackfin arch: flush/inv the correct range when using write back cache and fix bugs find by dmacopy
  Blackfin arch: update kgdb patch
  Blackfin arch: Comply with revised Anomaly Workarounds for BF533 05000311 and BF561 05000323
  Blackfin arch: Print out debug info, as early as possible
  Blackfin arch: Enable earlyprintk earlier - so any error after our interrupt tables are set up will print out
  Blackfin arch: fix endless loop bug when a double fault happens
  Blackfin arch: Initial patch to add earlyprintk support
  Blackfin arch: add TWIx_REGBASE and SPIx_REGBASE to specific CPU header files, use the new REGBASE for board platform resources
  Blackfin arch: modify the insX/outsX and dma_insX/dma_outsX to be compatible with other archs
  Blackfin arch: add more common defines for output sections
  Blackfin arch: cleanup IO and DMA_IO API function definitions according to other arches
  ...
  • Loading branch information
Linus Torvalds committed Oct 12, 2007
2 parents c634920 + bbf275f commit 1ef3e36
Show file tree
Hide file tree
Showing 116 changed files with 6,069 additions and 4,804 deletions.
3 changes: 2 additions & 1 deletion Documentation/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ parameter is applicable:
APIC APIC support is enabled.
APM Advanced Power Management support is enabled.
AX25 Appropriate AX.25 support is enabled.
BLACKFIN Blackfin architecture is enabled.
DRM Direct Rendering Management support is enabled.
EDD BIOS Enhanced Disk Drive Services (EDD) is enabled
EFI EFI Partitioning (GPT) is enabled
Expand Down Expand Up @@ -550,7 +551,7 @@ and is between 256 and 4096 characters. It is defined in the file

dtc3181e= [HW,SCSI]

earlyprintk= [X86-32,X86-64,SH]
earlyprintk= [X86-32,X86-64,SH,BLACKFIN]
earlyprintk=vga
earlyprintk=serial[,ttySn[,baudrate]]

Expand Down
26 changes: 0 additions & 26 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -718,34 +718,8 @@ M: [email protected]
S: Maintained

BLACKFIN ARCHITECTURE
P: Aubrey Li
M: [email protected]
P: Bernd Schmidt
M: [email protected]
P: Bryan Wu
M: [email protected]
P: Grace Pan
M: [email protected]
P: Marc Hoffman
M: [email protected]
P: Michael Hennerich
M: [email protected]
P: Mike Frysinger
M: [email protected]
P: Jerry Zeng
M: [email protected]
P: Jie Zhang
M: [email protected]
P: Robin Getz
M: [email protected]
P: Roy Huang
M: [email protected]
P: Sonic Zhang
M: [email protected]
P: Vivi Li
M: [email protected]
P: Yi Li
M: [email protected]
L: [email protected] (subscribers-only)
W: http://blackfin.uclinux.org
S: Supported
Expand Down
Loading

0 comments on commit 1ef3e36

Please sign in to comment.