mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-09-18 18:15:59 +00:00
Merge branch 'pxa-trizeps' into pxa-machines
Conflicts: drivers/pcmcia/Makefile
This commit is contained in:
commit
5ff7f78a3d
10 changed files with 680 additions and 383 deletions
Loading…
Add table
Add a link
Reference in a new issue