Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b0e53a7 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into for-3.11 



This is to receive percpu_refcount which will replace atomic_t
reference count in cgroup_subsys_state.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents ea15f8cc dbece3a0

Documentation/devicetree/bindings/net/macb.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Required properties: 
- compatible: Should be "cdns,[<chip>-]{macb|gem}"

  Use "cdns,at91sam9260-macb" Atmel at91sam9260 and at91sam9263 SoCs.

  Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".

  Use "cnds,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  the Cadence GEM, or the generic form: "cdns,gem".

- reg: Address and length of the register set for the device

- interrupts: Should contain macb interrupt