Merge lp://staging/~gandelman-a/ubuntu/oneiric/dahdi-linux/spinlock_patch into lp://staging/ubuntu/oneiric/dahdi-linux
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merge reported by: | Dave Walker |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~gandelman-a/ubuntu/oneiric/dahdi-linux/spinlock_patch |
| Merge into: | lp://staging/ubuntu/oneiric/dahdi-linux |
| Diff against target: |
16587 lines (+246/-16096) 33 files modified
.pc/applied-patches (+0/-5) .pc/chanmute/include/dahdi/dahdi_config.h (+0/-187) .pc/dahdi_linux_extra/drivers/dahdi/Kbuild (+0/-153) .pc/dahdi_linux_extra/drivers/dahdi/Kconfig (+0/-294) .pc/no_firmware_download/Makefile (+0/-222) .pc/oslec_auto/drivers/dahdi/Kbuild (+0/-149) .pc/wcb4xxp_bn4s0e/drivers/dahdi/wcb4xxp/base.c (+0/-3047) Makefile (+1/-1) debian/changelog (+8/-0) debian/patches/define_spinlock (+234/-0) debian/patches/series (+1/-0) drivers/dahdi/Kbuild (+1/-12) drivers/dahdi/Kconfig (+0/-51) drivers/dahdi/ap400/Kbuild (+0/-26) drivers/dahdi/ap400/ap400.h (+0/-107) drivers/dahdi/ap400/ap400_drv.c (+0/-2363) drivers/dahdi/ap400/apec.c (+0/-390) drivers/dahdi/ap400/apec.h (+0/-48) drivers/dahdi/opvxa1200.c (+0/-3026) drivers/dahdi/wcb4xxp/base.c (+0/-1) drivers/dahdi/wcopenpci.c (+0/-1850) drivers/dahdi/zaphfc/Kbuild (+0/-10) drivers/dahdi/zaphfc/base.c (+0/-1710) drivers/dahdi/zaphfc/fifo.c (+0/-375) drivers/dahdi/zaphfc/fifo.h (+0/-139) drivers/dahdi/zaphfc/zaphfc.h (+0/-418) drivers/staging/echo/Kbuild (+0/-6) drivers/staging/echo/echo.c (+0/-662) drivers/staging/echo/echo.h (+0/-175) drivers/staging/echo/fir.h (+0/-286) drivers/staging/echo/mmx.h (+0/-288) drivers/staging/echo/oslec.h (+0/-94) include/dahdi/dahdi_config.h (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~gandelman-a/ubuntu/oneiric/dahdi-linux/spinlock_patch |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Dave Walker (community) | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
debian/
DEFINE_SPINLOCK into include/
commit (r9411)
http://
To post a comment you must log in.
Revision history for this message
| Adam Gandelman (gandelman-a) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Attached is a cleaner debdiff, without the .pc noise. Between
dahdi-linux_
Adam